From 0bfae356d4f774c939a5642cd19ee6bfc682b8e7 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Sat, 16 May 2015 11:11:26 -0400
Subject: [PATCH] MDEV-8166 : Adding index on new table from select crashes
 Galera cluster

In wsrep, CTAS should be handled like a regular transaction.
Added a test case.
---
 mysql-test/suite/galera/r/create.result | 31 +++++++++++++++++++++++++
 mysql-test/suite/galera/t/create.test   | 24 +++++++++++++++++++
 sql/sql_parse.cc                        |  9 +------
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/mysql-test/suite/galera/r/create.result b/mysql-test/suite/galera/r/create.result
index 2c31ed76d1e..d32a0378eb6 100644
--- a/mysql-test/suite/galera/r/create.result
+++ b/mysql-test/suite/galera/r/create.result
@@ -24,5 +24,36 @@ SET @@GLOBAL.wsrep_forced_binlog_format=@wsrep_forced_binlog_format_saved;
 # MDEV-7673: CREATE TABLE SELECT fails on Galera cluster
 #
 CREATE TABLE t1 (i INT) ENGINE=INNODB DEFAULT CHARSET=utf8 SELECT 1 as i;
+SELECT * FROM t1;
+i
+1
+SELECT * FROM t1;
+i
+1
 DROP TABLE t1;
+#
+# MDEV-8166 : Adding index on new table from select crashes Galera
+# cluster
+#
+CREATE TABLE t1(i int(11) NOT NULL DEFAULT '0') ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO t1(i) VALUES (1), (2), (3);
+CREATE TABLE t2 (i INT) SELECT i FROM t1;
+ALTER TABLE t2 ADD INDEX idx(i);
+SELECT * FROM t2;
+i
+1
+2
+3
+SELECT * FROM t2;
+i
+1
+2
+3
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `i` int(11) DEFAULT NULL,
+  KEY `idx` (`i`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1, t2;
 # End of tests
diff --git a/mysql-test/suite/galera/t/create.test b/mysql-test/suite/galera/t/create.test
index 38c793e33b6..fb9b0935288 100644
--- a/mysql-test/suite/galera/t/create.test
+++ b/mysql-test/suite/galera/t/create.test
@@ -25,10 +25,34 @@ SET @@GLOBAL.wsrep_forced_binlog_format=@wsrep_forced_binlog_format_saved;
 --echo #
 --echo # MDEV-7673: CREATE TABLE SELECT fails on Galera cluster
 --echo #
+--connection node_1
 CREATE TABLE t1 (i INT) ENGINE=INNODB DEFAULT CHARSET=utf8 SELECT 1 as i;
+SELECT * FROM t1;
 
+--connection node_2
+SELECT * FROM t1;
 # Cleanup
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-8166 : Adding index on new table from select crashes Galera
+--echo # cluster
+--echo #
+--connection node_1
+CREATE TABLE t1(i int(11) NOT NULL DEFAULT '0') ENGINE=InnoDB DEFAULT CHARSET=utf8;
+INSERT INTO t1(i) VALUES (1), (2), (3);
+
+CREATE TABLE t2 (i INT) SELECT i FROM t1;
+ALTER TABLE t2 ADD INDEX idx(i);
+
+SELECT * FROM t2;
+
+--connection node_2
+SELECT * FROM t2;
+SHOW CREATE TABLE t2;
+
+# Cleanup
+DROP TABLE t1, t2;
+
 --echo # End of tests
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1b965b080e0..a0b98ec5601 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2917,17 +2917,10 @@ case SQLCOM_PREPARE:
         if (create_info.options & HA_LEX_CREATE_TMP_TABLE)
           thd->variables.option_bits|= OPTION_KEEP_LOG;
 
-#ifdef WITH_WSREP
-        if (WSREP(thd) &&
-            (!thd->is_current_stmt_binlog_format_row() ||
-             !(create_info.options & HA_LEX_CREATE_TMP_TABLE)))
-          WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name,
-                                   NULL)
-#endif
-
         /*
           select_create is currently not re-execution friendly and
           needs to be created for every execution of a PS/SP.
+          Note: In wsrep-patch, CTAS is handled like a regular transaction.
         */
         if ((result= new select_create(create_table,
                                        &create_info,