Merge bk@192.168.21.1:mysql-4.1

into mysql.com:/home/hf/work/mysql-4.1.mrg

Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.mrg
99c42304 · unknown · f0c693cc · 6b02ec1c · 99c42304
Commit 99c42304 authored May 04, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

innobase/include/dict0dict.ic innobase/include/dict0dict.ic +0 -2

No files found.
--- a/innobase/include/dict0dict.ic
+++ b/innobase/include/dict0dict.ic
@@ -93,7 +93,6 @@ dict_table_get_n_user_cols(
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
 	return(table->n_cols - DATA_N_SYS_COLS);
 }
@@ -127,7 +126,6 @@ dict_table_get_n_cols(
 {
 	ut_ad(table);
 	ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
-	ut_ad(table->cached);
 	return(table->n_cols);
 }