diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-08 17:43:48 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-09-08 17:43:48 -0400 |
| commit | 28ad6a7f28d1bdfb0d10530f8ab667213005807a (patch) | |
| tree | 909282e82bcd49a4c8a9f7c219952b80857f38a5 /sql/sql_base.cc | |
| parent | 067ed23c274df9b03d2574e3183dfd36566ba54d (diff) | |
| download | mariadb-git-28ad6a7f28d1bdfb0d10530f8ab667213005807a.tar.gz | |
MDEV-8763: Galera tests failures with --ps-protocol
(MDEV-8617: Post-fix for 10.1)
* Reset THD's PS members before returning when node is
not ready
* Add CF_SKIP_WSREP_CHECK flag to COM_STMT_XXX commands
* Skip TO replication of COM_STMT_PREPAREs for MyISAM
* Updated tests
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 86b37742bea..9162969e2d5 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4698,8 +4698,12 @@ restart: if (!tbl) continue; - if (WSREP_ON && sqlcom_can_generate_row_events(thd) && - wsrep_replicate_myisam && tables && tbl->file->ht == myisam_hton && + if (WSREP_ON && + wsrep_replicate_myisam && + tables && + tbl->file->ht == myisam_hton && + sqlcom_can_generate_row_events(thd) && + thd->get_command() != COM_STMT_PREPARE && tables->lock_type >= TL_WRITE_ALLOW_WRITE) { WSREP_TO_ISOLATION_BEGIN(NULL, NULL, tables); |