mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 00:24:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

refs codership/mysql-wsrep#198 Removed code duplication, PXC specifics

Browse source 
* Total order isolation was started twice for FLUSH TABLES, from
  reload_acl_and_cache() and from mysql_execute_command(). Removed
  the reload_acl_and_cache() part.
* Removed PXC specific stuff from MTR tests
This commit is contained in:
Teemu Ollakka 2015-10-23 09:38:33 +03:00 • committed by Nirbhay Choubey
commit ea0b1837ed
3 changed files with 0 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mysql-test/suite/galera/r/galera_flush.result
View file

@ -42,22 +42,6 @@ wsrep_last_committed_diff
FLUSH RELAY LOGS;
wsrep_last_committed_diff
1
SET @userstat_old= @@userstat;
SET GLOBAL userstat=ON;
FLUSH CLIENT_STATISTICS;
FLUSH INDEX_STATISTICS;
FLUSH TABLE_STATISTICS;
FLUSH USER_STATISTICS;
wsrep_last_committed_diff
1
SET @old_thread_statistics= @@global.thread_statistics;
SET GLOBAL thread_statistics= ON;
FLUSH THREAD_STATISTICS;
wsrep_last_committed_diff
1
FLUSH CHANGED_PAGE_BITMAPS;
wsrep_last_committed_diff
1
CREATE TABLE t1 (f1 INTEGER);
FLUSH LOGS;
FLUSH TABLES WITH READ LOCK;
@ -84,5 +68,3 @@ wsrep_last_committed_diff
1
DROP TABLE t1;
DROP TABLE t2;
SET GLOBAL userstat= @userstat_old;
SET GLOBAL thread_statistics= @old_thread_statistics;

48
mysql-test/suite/galera/t/galera_flush.test
View file

@ -155,50 +155,6 @@ FLUSH RELAY LOGS;
--eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 1 AS wsrep_last_committed_diff;
--enable_query_log
--connection node_1
SET @userstat_old= @@userstat;
SET GLOBAL userstat=ON;
--connection node_2
--let $wsrep_last_committed_before = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--connection node_1
FLUSH CLIENT_STATISTICS;
FLUSH INDEX_STATISTICS;
FLUSH TABLE_STATISTICS;
FLUSH USER_STATISTICS;
--connection node_2
--let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--disable_query_log
--eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 4 AS wsrep_last_committed_diff;
--enable_query_log
--connection node_1
SET @old_thread_statistics= @@global.thread_statistics;
SET GLOBAL thread_statistics= ON;
--connection node_2
--let $wsrep_last_committed_before = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--connection node_1
FLUSH THREAD_STATISTICS;
--connection node_2
--let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--disable_query_log
--eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 1 AS wsrep_last_committed_diff;
--enable_query_log
--connection node_2
--let $wsrep_last_committed_before = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--connection node_1
FLUSH CHANGED_PAGE_BITMAPS;
--connection node_2
--let $wsrep_last_committed_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'`
--disable_query_log
--eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 1 AS wsrep_last_committed_diff;
--enable_query_log
#
# The following statements should not be replicated: FLUSH LOGS, FLUSH TABLES WITH LOCKS
#
@ -264,10 +220,6 @@ FLUSH TABLES t1;
--eval SELECT $wsrep_last_committed_after = $wsrep_last_committed_before + 1 AS wsrep_last_committed_diff;
--enable_query_log
--connection node_1
DROP TABLE t1;
DROP TABLE t2;
SET GLOBAL userstat= @userstat_old;
SET GLOBAL thread_statistics= @old_thread_statistics;

36
sql/sql_reload.cc
View file

@ -29,9 +29,6 @@
#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);
@ -316,36 +313,6 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
}
}
}
#ifdef WITH_WSREP
if (WSREP(thd) && !thd->lex->no_write_to_binlog
&& (options & REFRESH_TABLES)
&& !(options & (REFRESH_FOR_EXPORT|REFRESH_READ_LOCK)))
{
/*
This is done here because LOCK TABLES is not replicated in galera,
the upgrade of which is checked above. Hence, done after/if we
are able to upgrade locks.
Also, note that, in error log with debug you may see
'thread holds MDL locks at TI' but since this is a flush
tables and is required for LOCK TABLE WRITE
it can be ignored there.
*/
if (tables)
{
if (wsrep_to_isolation_begin(thd, NULL, NULL, tables))
{
result= 1;
goto cleanup;
}
}
else if (wsrep_to_isolation_begin(thd, WSREP_MYSQL_DB, NULL, NULL))
{
result= 1;
goto cleanup;
}
}
#endif /* WITH_WSREP */
#ifdef WITH_WSREP
if (thd && thd->wsrep_applier)
@ -369,9 +336,6 @@ 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)