1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from lp:codership-mysql/5.5 rev #3895

Browse Source
This commit is contained in:
Seppo Jaakola 2013-11-26 17:03:14 +02:00
parent a2594e96f7
commit 4a11e84414
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sql/wsrep_hton.cc
View File

@ -70,19 +70,22 @@ handlerton *wsrep_hton;
void wsrep_register_hton(THD* thd, bool all) void wsrep_register_hton(THD* thd, bool all)
{ {
THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt; if (thd->wsrep_exec_mode == LOCAL_STATE)
for (Ha_trx_info *i= trans->ha_list; WSREP(thd) && i; i = i->next())
{ {
if (i->ht()->db_type == DB_TYPE_INNODB) THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt;
for (Ha_trx_info *i= trans->ha_list; WSREP(thd) && i; i = i->next())
{ {
trans_register_ha(thd, all, wsrep_hton); if (i->ht()->db_type == DB_TYPE_INNODB)
/* follow innodb read/write settting */
if (i->is_trx_read_write())
{ {
thd->ha_data[wsrep_hton->slot].ha_info[all].set_trx_read_write(); trans_register_ha(thd, all, wsrep_hton);
/* follow innodb read/write settting */
if (i->is_trx_read_write())
{
thd->ha_data[wsrep_hton->slot].ha_info[all].set_trx_read_write();
}
break;
} }
break;
} }
} }
} }