database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merged revisions 3425..3430 from mariadb-galera-5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2013-10-07 09:43:19 +03:00
parent 255e20a175
commit 61bda9a2f0
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/wsrep_mysqld.cc
View File

@@ -714,7 +714,7 @@ bool wsrep_start_replication()
uint64_t caps = wsrep->capabilities (wsrep);
wsrep_incremental_data_collection =
(caps & WSREP_CAP_WRITE_SET_INCREMENTS);
!!(caps & WSREP_CAP_WRITE_SET_INCREMENTS);
char* opts= wsrep->options_get(wsrep);
if (opts)
@@ -1254,6 +1254,12 @@ int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
if (!ret)
{
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;