summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-05-03 16:21:43 +0300
committerunknown <monty@narttu.mysql.fi>2003-05-03 16:21:43 +0300
commit34c3c0279441554e8d42ff0ec18a2890c1a6e148 (patch)
tree30be27be6dac81e03afd60853ff3dae87c704e17 /sql/sql_base.cc
parent6db41f7793d81c08f042e0b1ff23e5d387b2976f (diff)
downloadmariadb-git-34c3c0279441554e8d42ff0ec18a2890c1a6e148.tar.gz
Fix problem where key_read was not cleaned up properly, which caused assert in innodb test.
mysql-test/r/innodb.result: Changed tests to make them repeatable. mysql-test/t/innodb.test: Changed tests to make them repeatable. sql/opt_sum.cc: Safety fix sql/sql_base.cc: Safety assert
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 0f0c3c97ed2..f0aa8e9c351 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -482,8 +482,9 @@ bool close_thread_table(THD *thd, TABLE **table_ptr)
{
DBUG_ENTER("close_thread_table");
- bool found_old_table=0;
- TABLE *table=*table_ptr;
+ bool found_old_table= 0;
+ TABLE *table= *table_ptr;
+ DBUG_ASSERT(table->key_read == 0);
*table_ptr=table->next;
if (table->version != refresh_version ||