Skip to content

M
mariadb
Commit 7a747342 authored by aivanov@mysql.com's avatar aivanov@mysql.com
Browse files
Options

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

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521
parents 2b253498 4cff042a
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
innobase/include/dict0dict.ic
View file @ 7a747342
...@@ -92,7 +92,6 @@ dict_table_get_n_user_cols( ...@@ -92,7 +92,6 @@ dict_table_get_n_user_cols(
{ {
ut_ad(table); ut_ad(table);
ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
ut_ad(table->cached);
return(table->n_cols - DATA_N_SYS_COLS); return(table->n_cols - DATA_N_SYS_COLS);
} }
...@@ -126,7 +125,6 @@ dict_table_get_n_cols( ...@@ -126,7 +125,6 @@ dict_table_get_n_cols(
{ {
ut_ad(table); ut_ad(table);
ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N);
ut_ad(table->cached);
return(table->n_cols); return(table->n_cols);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7