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

bzr merge -r4011..4013 codership-mysql/5.5

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-08-06 15:47:17 -04:00
parent 4788577c20
commit b09f1f9e65
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@@ -3339,8 +3339,7 @@ end_with_restore_list:
if ((res= insert_precheck(thd, all_tables))) if ((res= insert_precheck(thd, all_tables)))
break; break;
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (lex->sql_command == SQLCOM_INSERT_SELECT && if (thd->wsrep_consistency_check == CONSISTENCY_CHECK_DECLARED)
thd->wsrep_consistency_check == CONSISTENCY_CHECK_DECLARED)
{ {
thd->wsrep_consistency_check = CONSISTENCY_CHECK_RUNNING; thd->wsrep_consistency_check = CONSISTENCY_CHECK_RUNNING;
WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL); WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL);

8
sql/wsrep_mysqld.cc
View File

@@ -776,10 +776,10 @@ void wsrep_filter_new_cluster (int* argc, char* argv[])
{ {
/* make a copy of the argument to convert possible underscores to hyphens. /* make a copy of the argument to convert possible underscores to hyphens.
* the copy need not to be longer than WSREP_NEW_CLUSTER option */ * the copy need not to be longer than WSREP_NEW_CLUSTER option */
char arg[sizeof(WSREP_NEW_CLUSTER) + 2]= { 0, }; char arg[sizeof(WSREP_NEW_CLUSTER) + 1]= { 0, };
strncpy(arg, argv[i], sizeof(arg) - 1); strncpy(arg, argv[i], sizeof(arg) - 1);
char* underscore; char* underscore(arg);
while (NULL != (underscore= strchr(arg, '_'))) *underscore= '-'; while (NULL != (underscore= strchr(underscore, '_'))) *underscore= '-';
if (!strcmp(arg, WSREP_NEW_CLUSTER)) if (!strcmp(arg, WSREP_NEW_CLUSTER))
{ {
@@ -886,7 +886,7 @@ wsrep_causal_wait (THD* thd)
switch (ret) switch (ret)
{ {
case WSREP_NOT_IMPLEMENTED: case WSREP_NOT_IMPLEMENTED:
msg= "consistent reads by wsrep backend. " msg= "synchronous reads by wsrep backend. "
"Please unset wsrep_causal_reads variable."; "Please unset wsrep_causal_reads variable.";
err= ER_NOT_SUPPORTED_YET; err= ER_NOT_SUPPORTED_YET;
break; break;