Merge lp:~percona-core/percona-xtradb-cluster/bug-1402338 into lp:percona-xtradb-cluster

[Raghavendra D Prabhu]

[Alexey Kopytov (akopytov)]

Are you going to fix this in 5.5? If not, should the bug status in 5.5 be "Won't Fix" or "Invalid"?

review: Needs Information

[Raghavendra D Prabhu (raghavendra-prabhu)]

Submitted for 5.5 as well.

[Alexey Kopytov (akopytov)]

Same comments as in https://code.launchpad.net/~percona-core/percona-xtradb-cluster/bug-1402338-5.5/+merge/245523

review: Needs Fixing

[Raghavendra D Prabhu (raghavendra-prabhu)]

Fixed.

[Alexey Kopytov (akopytov)]

You don't really need "\" at line 45.

review: Approve

=== modified file 'mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result'
--- mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result	2014-09-26 09:54:38 +0000
+++ mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result	2015-01-27 11:57:39 +0000
@@ -1,8 +1,7 @@
 SET GLOBAL wsrep_replicate_myisam = FALSE;
 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=MyISAM;
 INSERT INTO t1 VALUES (1);
-SELECT COUNT(*) = 0 FROM t1;
-COUNT(*) = 0
-1
+SELECT * FROM t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
 SET GLOBAL wsrep_replicate_myisam = 0;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test'
--- mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test	2014-09-26 09:54:38 +0000
+++ mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test	2015-01-27 11:57:39 +0000
@@ -13,7 +13,8 @@
 INSERT INTO t1 VALUES (1);
 
 --connection node_2
-SELECT COUNT(*) = 0 FROM t1;
+--error ER_NO_SUCH_TABLE
+SELECT * FROM t1;
 
 --connection node_1
 --eval SET GLOBAL wsrep_replicate_myisam = $wsrep_replicate_myisam_orig

=== modified file 'sql/wsrep_mysqld.cc'
--- sql/wsrep_mysqld.cc	2014-11-14 00:39:17 +0000
+++ sql/wsrep_mysqld.cc	2015-01-27 11:57:39 +0000
@@ -1410,11 +1410,29 @@
                              const TABLE_LIST* table_list)
 {
 
+  LEX *lex;
   /*
     No isolation for applier or replaying threads.
    */
   if (thd->wsrep_exec_mode == REPL_RECV) return 0;
 
+
+  lex= thd->lex;
+  if (!wsrep_replicate_myisam && lex->create_info.db_type && \
+          lex->create_info.db_type->db_type == DB_TYPE_MYISAM)
+  {
+    if (db_) 
+    {
+        WSREP_INFO("Cannot replicate MyISAM DDL for %s.%s with wsrep_replicate_myisam OFF", db_, table_);
+    } 
+    else 
+    {
+        WSREP_INFO("Cannot replicate MyISAM DDL with wsrep_replicate_myisam OFF");
+    }
+
+    return 0;
+  }
+
   int ret= 0;
   mysql_mutex_lock(&thd->LOCK_wsrep_thd);