Skip to content

Commit 17ac959

Browse files
author
Nirbhay Choubey
committed
Bug#1421360: Add Percona Server specific FLUSH statements.
- Restore FLUSH commands supported by MariaDB (removed in the previous commit) - Adjust test case
1 parent 5d4fb15 commit 17ac959

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--query_cache_type=1 --query_cache_size=1000000 --innodb_track_changed_pages=1 --userstat=1 --thread_statistics=1
1+
--query_cache_type=1 --query_cache_size=1000000 --userstat=1 --wsrep_replicate_myisam=true

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ DROP TABLE IF EXISTS t1, t2, x1, x2;
1515
--connection node_1
1616
CREATE TABLE t1 (f1 INTEGER);
1717
CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
18-
SET GLOBAL wsrep_replicate_myisam = TRUE;
1918
CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
2019
CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
2120
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -39,6 +38,10 @@ FLUSH LOCAL SLOW LOGS;
3938
FLUSH LOCAL GENERAL LOGS;
4039
FLUSH LOCAL ENGINE LOGS;
4140
FLUSH LOCAL RELAY LOGS;
41+
FLUSH LOCAL CLIENT_STATISTICS;
42+
FLUSH LOCAL INDEX_STATISTICS;
43+
FLUSH LOCAL TABLE_STATISTICS;
44+
FLUSH LOCAL USER_STATISTICS;
4245
FLUSH LOCAL LOGS;
4346
FLUSH LOCAL BINARY LOGS;
4447
FLUSH LOCAL TABLES WITH READ LOCK;
@@ -74,7 +77,6 @@ SELECT COUNT(*) = 10 FROM x2;
7477
DROP TABLE t1, t2, x1, x2;
7578
CREATE TABLE t1 (f1 INTEGER);
7679
CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
77-
SET GLOBAL wsrep_replicate_myisam = TRUE;
7880
CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
7981
CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
8082
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -100,6 +102,10 @@ FLUSH SLOW LOGS;
100102
FLUSH GENERAL LOGS;
101103
FLUSH ENGINE LOGS;
102104
FLUSH RELAY LOGS;
105+
FLUSH CLIENT_STATISTICS;
106+
FLUSH INDEX_STATISTICS;
107+
FLUSH TABLE_STATISTICS;
108+
FLUSH USER_STATISTICS;
103109
FLUSH LOGS;
104110
FLUSH BINARY LOGS;
105111
FLUSH TABLES WITH READ LOCK;

sql/sql_parse.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4690,7 +4690,11 @@ case SQLCOM_PREPARE:
46904690
REFRESH_QUERY_CACHE_FREE |
46914691
#endif /* HAVE_QUERY_CACHE */
46924692
REFRESH_STATUS |
4693-
REFRESH_USER_RESOURCES))
4693+
REFRESH_USER_RESOURCES |
4694+
REFRESH_TABLE_STATS |
4695+
REFRESH_INDEX_STATS |
4696+
REFRESH_USER_STATS |
4697+
REFRESH_CLIENT_STATS))
46944698
{
46954699
WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL)
46964700
}

0 commit comments

Comments
 (0)