Commit e9eb0239 authored by unknown's avatar unknown
Browse files

Merge marko@build.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/l/mysql-4.0
parents 8dd15d31 1f7f2662

innobase/btr/btr0btr.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ btr_get_size( 
		

		n += fseg_n_reserved_pages(seg_header, &dummy, &mtr);		

	} else {

		ut_a(0);

		ut_error;

	}



	mtr_commit(&mtr);

innobase/buf/buf0flu.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ buf_flush_buffered_writes(void) 
	"InnoDB: files.\n",

			block->offset, block->space);



			ut_a(0);

			ut_error;

		}

	}

innobase/buf/buf0lru.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ buf_LRU_get_free_block(void) 
"InnoDB: on Linux!\n",

		(ulong)(buf_pool->curr_size / (1024 * 1024 / UNIV_PAGE_SIZE)));



		ut_a(0);

		ut_error;

	   

	} else if (!recv_recovery_on && UT_LIST_GET_LEN(buf_pool->free)

	   + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 5) {

innobase/data/data0data.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ dfield_check_typed( 
"InnoDB: Error: data field type %lu, len %lu\n",

			dfield_get_type(field)->mtype, dfield_get_len(field));



		ut_a(0);

		ut_error;

	}



	return(TRUE);

innobase/dict/dict0crea.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ dict_create_sys_tables_tuple( 
 	if (table->type == DICT_TABLE_CLUSTER_MEMBER) {

		dfield_set_data(dfield, table->cluster_name,

				ut_strlen(table->cluster_name));

		ut_a(0); /* Oracle-style clusters are not supported yet */

		ut_error; /* Oracle-style clusters are not supported yet */

	} else {

		dfield_set_data(dfield, NULL, UNIV_SQL_NULL);

	}