summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2006-05-03 23:25:01 +0400
committerunknown <aivanov@mysql.com>2006-05-03 23:25:01 +0400
commit219d5cf225bf1b1eaa29666aaeb781cbc2a3ee41 (patch)
treedb4cc44c1a3bc1c8ad17ff9942b2df3393587144 /innobase
parent38b1f7c7c3790a6ee59dd213eab16fe9c6fd97f4 (diff)
downloadmariadb-git-219d5cf225bf1b1eaa29666aaeb781cbc2a3ee41.tar.gz
Applied innodb-4.1-ss26 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails". innobase/include/dict0dict.ic: Applied innodb-4.1-ss26 snapshot. Remove too strict assertions from some dict_table_t accessor functions (Bug#19366).
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/dict0dict.ic2
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);
}