Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/alexi/innodb/mysql-4.1-ss26

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/alexi/innodb/mysql-4.1-ss26
6b02ec1c · unknown · e93b203d · 219d5cf2 · 6b02ec1c
Commit 6b02ec1c authored May 03, 2006 by unknown
Show 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);
 }