diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
| tree | d08462d84d10324bd05836c968288d8ab1739e11 /mysql-test/include | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_wsrep_enabled.inc | 8 | ||||
| -rw-r--r-- | mysql-test/include/write_result_to_file.inc | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mysql-test/include/have_wsrep_enabled.inc b/mysql-test/include/have_wsrep_enabled.inc index edb919fd852..439e13e1eb9 100644 --- a/mysql-test/include/have_wsrep_enabled.inc +++ b/mysql-test/include/have_wsrep_enabled.inc @@ -3,7 +3,7 @@ --source include/have_wsrep.inc ---require r/have_wsrep.require -disable_query_log; -SHOW VARIABLES LIKE 'wsrep_on'; -enable_query_log; +if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'wsrep_on' AND VARIABLE_VALUE='ON'`) +{ + --skip Test requires wsrep_on=ON +} diff --git a/mysql-test/include/write_result_to_file.inc b/mysql-test/include/write_result_to_file.inc index db5d546750c..3e2ddf48957 100644 --- a/mysql-test/include/write_result_to_file.inc +++ b/mysql-test/include/write_result_to_file.inc @@ -33,8 +33,7 @@ --let _WRTF_SERVER_NUMBER= $server_number if (!$server_number) { - # Note: 2 extra ports are reserved per server for galera use. - --let _WRTF_SERVER_NUMBER= `SELECT 1 + FLOOR((@@PORT - $MASTER_MYPORT) / 3)` + --let _WRTF_SERVER_NUMBER= `SELECT 1 + @@PORT - $MASTER_MYPORT` } --let $_write_result_msg= [server=$_WRTF_SERVER_NUMBER] |