mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 08:45:33 +02:00
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1 BitKeeper/etc/logging_ok: auto-union sql/sql_base.cc: Auto merged
This commit is contained in:
commit
b0bc3da102
2 changed files with 2 additions and 0 deletions
|
|
@ -13,6 +13,7 @@ administrador@light.hegel.local
|
||||||
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
|
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
|
||||||
akishkin@work.mysql.com
|
akishkin@work.mysql.com
|
||||||
antony@ltantony.dsl-verizon.net
|
antony@ltantony.dsl-verizon.net
|
||||||
|
antony@ltantony.mysql.com
|
||||||
antony@ltantony.rdg.cyberkinetica.com
|
antony@ltantony.rdg.cyberkinetica.com
|
||||||
antony@ltantony.rdg.cyberkinetica.homeunix.net
|
antony@ltantony.rdg.cyberkinetica.homeunix.net
|
||||||
arjen@bitbike.com
|
arjen@bitbike.com
|
||||||
|
|
|
||||||
|
|
@ -1267,6 +1267,7 @@ bool wait_for_tables(THD *thd)
|
||||||
{
|
{
|
||||||
/* Now we can open all tables without any interference */
|
/* Now we can open all tables without any interference */
|
||||||
thd->proc_info="Reopen tables";
|
thd->proc_info="Reopen tables";
|
||||||
|
thd->version= refresh_version;
|
||||||
result=reopen_tables(thd,0,0);
|
result=reopen_tables(thd,0,0);
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&LOCK_open);
|
pthread_mutex_unlock(&LOCK_open);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue