diff options
| author | unknown <aivanov@mysql.com> | 2006-05-03 23:45:55 +0400 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-05-03 23:45:55 +0400 |
| commit | 6b02ec1caa35731f1532c4f4dc158a0d18a7a57a (patch) | |
| tree | 1e1ce11fba2d7ffbdb34fb6ceb2c6dfd70e102fa | |
| parent | e93b203d08dd7f64b140485993ac85791343e115 (diff) | |
| parent | 219d5cf225bf1b1eaa29666aaeb781cbc2a3ee41 (diff) | |
| download | mariadb-git-6b02ec1caa35731f1532c4f4dc158a0d18a7a57a.tar.gz | |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/alexi/innodb/mysql-4.1-ss26
| -rw-r--r-- | innobase/include/dict0dict.ic | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/innobase/include/dict0dict.ic b/innobase/include/dict0dict.ic index 85e4aaf1a05..4c1a88cfd1b 100644 --- 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); } |