refs codership/mysql-wsrep#198 fixed merge issues

mysql-test/suite/galera/r/galera_flush_local.result

 DROP TABLE IF EXISTS t1, t2, x1, x2;
 CREATE TABLE t1 (f1 INTEGER);
 CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
-SET SESSION wsrep_replicate_myisam = TRUE;
+SET GLOBAL wsrep_replicate_myisam = TRUE;
 CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
 CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -21,12 +21,6 @@ FLUSH LOCAL SLOW LOGS;
 FLUSH LOCAL GENERAL LOGS;
 FLUSH LOCAL ENGINE LOGS;
 FLUSH LOCAL RELAY LOGS;
-FLUSH LOCAL CLIENT_STATISTICS;
-FLUSH LOCAL INDEX_STATISTICS;
-FLUSH LOCAL TABLE_STATISTICS;
-FLUSH LOCAL USER_STATISTICS;
-FLUSH LOCAL THREAD_STATISTICS;
-FLUSH LOCAL CHANGED_PAGE_BITMAPS;
 FLUSH LOCAL LOGS;
 FLUSH LOCAL BINARY LOGS;
 FLUSH LOCAL TABLES WITH READ LOCK;
@@ -74,7 +68,7 @@ COUNT(*) = 10
 DROP TABLE t1, t2, x1, x2;
 CREATE TABLE t1 (f1 INTEGER);
 CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
-SET SESSION wsrep_replicate_myisam = TRUE;
+SET GLOBAL wsrep_replicate_myisam = TRUE;
 CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
 CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -95,12 +89,6 @@ FLUSH SLOW LOGS;
 FLUSH GENERAL LOGS;
 FLUSH ENGINE LOGS;
 FLUSH RELAY LOGS;
-FLUSH CLIENT_STATISTICS;
-FLUSH INDEX_STATISTICS;
-FLUSH TABLE_STATISTICS;
-FLUSH USER_STATISTICS;
-FLUSH THREAD_STATISTICS;
-FLUSH CHANGED_PAGE_BITMAPS;
 FLUSH LOGS;
 FLUSH BINARY LOGS;
 FLUSH TABLES WITH READ LOCK;

mysql-test/suite/galera/t/galera_flush_local.test

@@ -15,7 +15,7 @@ DROP TABLE IF EXISTS t1, t2, x1, x2;
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER);
 CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
-SET SESSION wsrep_replicate_myisam = TRUE;
+SET GLOBAL wsrep_replicate_myisam = TRUE;
 CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
 CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -39,12 +39,6 @@ FLUSH LOCAL SLOW LOGS;
 FLUSH LOCAL GENERAL LOGS;
 FLUSH LOCAL ENGINE LOGS;
 FLUSH LOCAL RELAY LOGS;
-FLUSH LOCAL CLIENT_STATISTICS;
-FLUSH LOCAL INDEX_STATISTICS;
-FLUSH LOCAL TABLE_STATISTICS;
-FLUSH LOCAL USER_STATISTICS;
-FLUSH LOCAL THREAD_STATISTICS;
-FLUSH LOCAL CHANGED_PAGE_BITMAPS;
 FLUSH LOCAL LOGS;
 FLUSH LOCAL BINARY LOGS;
 FLUSH LOCAL TABLES WITH READ LOCK;
@@ -80,7 +74,7 @@ SELECT COUNT(*) = 10 FROM x2;
 DROP TABLE t1, t2, x1, x2;
 CREATE TABLE t1 (f1 INTEGER);
 CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
-SET SESSION wsrep_replicate_myisam = TRUE;
+SET GLOBAL wsrep_replicate_myisam = TRUE;
 CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
 CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -106,12 +100,6 @@ FLUSH SLOW LOGS;
 FLUSH GENERAL LOGS;
 FLUSH ENGINE LOGS;
 FLUSH RELAY LOGS;
-FLUSH CLIENT_STATISTICS;
-FLUSH INDEX_STATISTICS;
-FLUSH TABLE_STATISTICS;
-FLUSH USER_STATISTICS;
-FLUSH THREAD_STATISTICS;
-FLUSH CHANGED_PAGE_BITMAPS;
 FLUSH LOGS;
 FLUSH BINARY LOGS;
 FLUSH TABLES WITH READ LOCK;

sql/sql_parse.cc

@@ -4690,16 +4690,7 @@ case SQLCOM_PREPARE:
     REFRESH_QUERY_CACHE_FREE                |
 #endif /* HAVE_QUERY_CACHE */
     REFRESH_STATUS                          |
-    REFRESH_USER_RESOURCES                  |
-    /*
-      Percona Server specific
-    */
-    REFRESH_FLUSH_PAGE_BITMAPS              |
-    REFRESH_TABLE_STATS                     |
-    REFRESH_INDEX_STATS                     |
-    REFRESH_USER_STATS                      |
-    REFRESH_CLIENT_STATS                    |
-    REFRESH_THREAD_STATS))
+    REFRESH_USER_RESOURCES))
     {
       WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL)
     }
@@ -4736,11 +4727,11 @@ case SQLCOM_PREPARE:
         */
         if (first_table)
         {
-            WSREP_TO_ISOLATION_BEGIN(NULL, NULL, first_table);
+            WSREP_TO_ISOLATION_BEGIN_WRTCHK(NULL, NULL, first_table);
         }
         else
         {
-            WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
+            WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL);
         }
       }
 #endif /* WITH_WSREP */

sql/sql_reload.cc

@@ -29,6 +29,10 @@
 #include "debug_sync.h"
 #include "des_key_file.h"
 
+#ifdef WITH_WSREP
+#include "sql_parse.h" // WSREP_MYSQL_DB
+#endif /* WITH_WSREP */
+
 static void disable_checkpoints(THD *thd);
 
 /**
@@ -365,6 +369,9 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
         result= 1;
       }
     }
+#ifdef WITH_WSREP
+cleanup:
+#endif /* WITH_WSREP */
     my_dbopt_cleanup();
   }
   if (options & REFRESH_HOSTS)