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

Proposed by Raghavendra D Prabhu on 2014-12-15
Status: Merged
Approved by: Alexey Kopytov on 2015-01-29
Approved revision: 947
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp:~percona-core/percona-xtradb-cluster/bug-1402338
Merge into: lp:percona-xtradb-cluster
Diff against target: 61 lines (+22/-4)
3 files modified
mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result (+2/-3)
mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test (+2/-1)
sql/wsrep_mysqld.cc (+18/-0)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/bug-1402338
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-12-15 Approve on 2015-01-29
Review via email: mp+244757@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

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

Submitted for 5.5 as well.

Fixed.

Alexey Kopytov (akopytov) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result'
2--- mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result 2014-09-26 09:54:38 +0000
3+++ mysql-test/suite/galera/r/galera_var_replicate_myisam_off.result 2015-01-27 11:57:39 +0000
4@@ -1,8 +1,7 @@
5 SET GLOBAL wsrep_replicate_myisam = FALSE;
6 CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=MyISAM;
7 INSERT INTO t1 VALUES (1);
8-SELECT COUNT(*) = 0 FROM t1;
9-COUNT(*) = 0
10-1
11+SELECT * FROM t1;
12+ERROR 42S02: Table 'test.t1' doesn't exist
13 SET GLOBAL wsrep_replicate_myisam = 0;
14 DROP TABLE t1;
15
16=== modified file 'mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test'
17--- mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test 2014-09-26 09:54:38 +0000
18+++ mysql-test/suite/galera/t/galera_var_replicate_myisam_off.test 2015-01-27 11:57:39 +0000
19@@ -13,7 +13,8 @@
20 INSERT INTO t1 VALUES (1);
21
22 --connection node_2
23-SELECT COUNT(*) = 0 FROM t1;
24+--error ER_NO_SUCH_TABLE
25+SELECT * FROM t1;
26
27 --connection node_1
28 --eval SET GLOBAL wsrep_replicate_myisam = $wsrep_replicate_myisam_orig
29
30=== modified file 'sql/wsrep_mysqld.cc'
31--- sql/wsrep_mysqld.cc 2014-11-14 00:39:17 +0000
32+++ sql/wsrep_mysqld.cc 2015-01-27 11:57:39 +0000
33@@ -1410,11 +1410,29 @@
34 const TABLE_LIST* table_list)
35 {
36
37+ LEX *lex;
38 /*
39 No isolation for applier or replaying threads.
40 */
41 if (thd->wsrep_exec_mode == REPL_RECV) return 0;
42
43+
44+ lex= thd->lex;
45+ if (!wsrep_replicate_myisam && lex->create_info.db_type && \
46+ lex->create_info.db_type->db_type == DB_TYPE_MYISAM)
47+ {
48+ if (db_)
49+ {
50+ WSREP_INFO("Cannot replicate MyISAM DDL for %s.%s with wsrep_replicate_myisam OFF", db_, table_);
51+ }
52+ else
53+ {
54+ WSREP_INFO("Cannot replicate MyISAM DDL with wsrep_replicate_myisam OFF");
55+ }
56+
57+ return 0;
58+ }
59+
60 int ret= 0;
61 mysql_mutex_lock(&thd->LOCK_wsrep_thd);
62

Subscribers

People subscribed via source and target branches

to all changes: