From 17ac9597163916d418c6cca2641242f20d682956 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Mon, 22 Feb 2016 22:07:59 -0500
Subject: [PATCH] Bug#1421360: Add Percona Server specific FLUSH statements.

- Restore FLUSH commands supported by MariaDB (removed in
the previous commit)
- Adjust test case
---
 mysql-test/suite/galera/t/galera_flush_local.opt  |  2 +-
 mysql-test/suite/galera/t/galera_flush_local.test | 10 ++++++++--
 sql/sql_parse.cc                                  |  6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/galera/t/galera_flush_local.opt b/mysql-test/suite/galera/t/galera_flush_local.opt
index 698bbefe41f..45a0ca24dc7 100644
--- a/mysql-test/suite/galera/t/galera_flush_local.opt
+++ b/mysql-test/suite/galera/t/galera_flush_local.opt
@@ -1 +1 @@
---query_cache_type=1 --query_cache_size=1000000 --innodb_track_changed_pages=1 --userstat=1 --thread_statistics=1
+--query_cache_type=1 --query_cache_size=1000000 --userstat=1 --wsrep_replicate_myisam=true
diff --git a/mysql-test/suite/galera/t/galera_flush_local.test b/mysql-test/suite/galera/t/galera_flush_local.test
index 733accea71c..768f4ea4f1b 100644
--- a/mysql-test/suite/galera/t/galera_flush_local.test
+++ b/mysql-test/suite/galera/t/galera_flush_local.test
@@ -15,7 +15,6 @@ 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 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,6 +38,10 @@ 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 LOGS;
 FLUSH LOCAL BINARY LOGS;
 FLUSH LOCAL TABLES WITH READ LOCK;
@@ -74,7 +77,6 @@ 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 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);
@@ -100,6 +102,10 @@ 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 LOGS;
 FLUSH BINARY LOGS;
 FLUSH TABLES WITH READ LOCK;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 249f4fb3434..d73aac801c2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4690,7 +4690,11 @@ end_with_restore_list:
     REFRESH_QUERY_CACHE_FREE                |
 #endif /* HAVE_QUERY_CACHE */
     REFRESH_STATUS                          |
-    REFRESH_USER_RESOURCES))
+    REFRESH_USER_RESOURCES                  |
+    REFRESH_TABLE_STATS                     |
+    REFRESH_INDEX_STATS                     |
+    REFRESH_USER_STATS                      |
+    REFRESH_CLIENT_STATS))
     {
       WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL)
     }