Commit 20afd6b1 authored by Seppo Jaakola's avatar Seppo Jaakola

References lp:587170 - merged fix in from wsrep-5.5-23 branch

This branch is now in position 3924 in wsrep-5.5-23
parent 4e00dd68
...@@ -714,7 +714,7 @@ bool wsrep_start_replication() ...@@ -714,7 +714,7 @@ bool wsrep_start_replication()
uint64_t caps = wsrep->capabilities (wsrep); uint64_t caps = wsrep->capabilities (wsrep);
wsrep_incremental_data_collection = wsrep_incremental_data_collection =
(caps & WSREP_CAP_WRITE_SET_INCREMENTS); !!(caps & WSREP_CAP_WRITE_SET_INCREMENTS);
char* opts= wsrep->options_get(wsrep); char* opts= wsrep->options_get(wsrep);
if (opts) if (opts)
...@@ -1254,6 +1254,12 @@ int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_, ...@@ -1254,6 +1254,12 @@ int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
if (!ret) if (!ret)
{ {
thd->wsrep_exec_mode= TOTAL_ORDER; thd->wsrep_exec_mode= TOTAL_ORDER;
/* It makes sense to set auto_increment_* to defaults in TOI operations */
if (wsrep_auto_increment_control)
{
thd->variables.auto_increment_offset = 1;
thd->variables.auto_increment_increment = 1;
}
} }
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment