diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-03-22 20:04:59 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-03-22 20:04:59 -0700 |
| commit | 210c51fc8c5d9f0e989487463a3e66eaa92db759 (patch) | |
| tree | e74a6586b8466fc366b1919f94e9310b3fdb6596 | |
| parent | 390520c1c80996c958a7e74b1f115b3df979102a (diff) | |
| download | mariadb-git-210c51fc8c5d9f0e989487463a3e66eaa92db759.tar.gz | |
fixed bug on re-open of temp tables after FLUSH in the middle of open
added flush test case, but had to comment the fun part out because it
does not work for some reason - will investigate why.
sql/sql_base.cc:
fixed bugs on re-open of temp tables after FLUSH in the middle of open
| -rw-r--r-- | mysql-test/r/flush.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush.test | 12 | ||||
| -rw-r--r-- | sql/sql_base.cc | 10 |
3 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result new file mode 100644 index 00000000000..76862936a16 --- /dev/null +++ b/mysql-test/r/flush.result @@ -0,0 +1,2 @@ +n +3 diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test new file mode 100644 index 00000000000..750ecdeadda --- /dev/null +++ b/mysql-test/t/flush.test @@ -0,0 +1,12 @@ +connect (con1,localhost,root,,test,0,mysql-master.sock); +connect (con2,localhost,root,,test,0,mysql-master.sock); +connection con1; +drop table if exists t1; +create temporary table t1(n int); +connection con2; +#send flush tables; +connection con1; +insert into t1 values(3); +select * from t1; +connection con2; +#reap; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c235ac6575a..801ef63dcf3 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -32,6 +32,7 @@ TABLE *unused_tables; /* Used by mysql_test */ HASH open_cache; /* Used by mysql_test */ +static void reset_query_id_on_temp_tables(THD* thd); static int open_unireg_entry(THD *thd,TABLE *entry,const char *db, const char *name, const char *alias, bool locked); @@ -1314,6 +1315,12 @@ err: } +static void reset_query_id_on_temp_tables(THD* thd) +{ + for(TABLE* tmp = thd->temporary_tables; tmp; tmp = tmp->next) + tmp->query_id = 0; +} + /***************************************************************************** ** open all tables in list *****************************************************************************/ @@ -1339,6 +1346,9 @@ int open_tables(THD *thd,TABLE_LIST *start) { /* close all 'old' tables used by this thread */ pthread_mutex_lock(&LOCK_open); + // if query_id is not reset, we will get an error + // re-opening a temp table + reset_query_id_on_temp_tables(thd); thd->version=refresh_version; TABLE **prev_table= &thd->open_tables; bool found=0; |