diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_wsrep_enabled.inc | 8 | ||||
| -rw-r--r-- | mysql-test/include/write_result_to_file.inc | 3 | ||||
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 3 | ||||
| -rw-r--r-- | mysql-test/r/have_wsrep.require | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/galera_2nodes.cnf | 4 | ||||
| -rw-r--r-- | mysql-test/suite/roles/set_default_role_for.result | 12 | ||||
| -rw-r--r-- | mysql-test/suite/roles/set_default_role_for.test | 12 | ||||
| -rw-r--r-- | mysql-test/t/mysql_tzinfo_to_sql_symlink.test | 5 |
8 files changed, 21 insertions, 28 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] diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 488b0823763..4e8507a5c4a 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -238,9 +238,6 @@ my @mysqld_rules= { 'pid-file' => \&fix_pidfile }, { '#host' => \&fix_host }, { 'port' => \&fix_port }, - # galera base_port and port used during SST - { '#galera_port' => \&fix_port }, - { '#sst_port' => \&fix_port }, { 'socket' => \&fix_socket }, { '#log-error' => \&fix_log_error }, { 'general-log' => 1 }, diff --git a/mysql-test/r/have_wsrep.require b/mysql-test/r/have_wsrep.require deleted file mode 100644 index af32ac7dca7..00000000000 --- a/mysql-test/r/have_wsrep.require +++ /dev/null @@ -1,2 +0,0 @@ -Variable_name Value -wsrep_on ON diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf index c0d5b3add3f..024ced1d20b 100644 --- a/mysql-test/suite/galera/galera_2nodes.cnf +++ b/mysql-test/suite/galera/galera_2nodes.cnf @@ -3,6 +3,8 @@ [mysqld.1] binlog-format=row +#galera_port=OPT.port +#sst_port=OPT.port wsrep_provider=@ENV.WSREP_PROVIDER wsrep_cluster_address='gcomm://' wsrep_provider_options='base_port=@mysqld.1.#galera_port' @@ -12,6 +14,8 @@ wsrep_causal_reads=ON [mysqld.2] binlog-format=row +#galera_port=OPT.port +#sst_port=OPT.port wsrep_provider=@ENV.WSREP_PROVIDER wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port' wsrep_provider_options='base_port=@mysqld.2.#galera_port' diff --git a/mysql-test/suite/roles/set_default_role_for.result b/mysql-test/suite/roles/set_default_role_for.result index 3e444a5f537..7289319a428 100644 --- a/mysql-test/suite/roles/set_default_role_for.result +++ b/mysql-test/suite/roles/set_default_role_for.result @@ -21,17 +21,17 @@ Grants for user_a@localhost GRANT role_a TO 'user_a'@'localhost' GRANT USAGE ON *.* TO 'user_a'@'localhost' GRANT SELECT ON *.* TO 'role_a' -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; user host default_role user_a localhost role_a user_b localhost role_b set default role NONE for current_user; -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; user host default_role user_a localhost user_b localhost role_b set default role current_role for current_user; -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; user host default_role user_a localhost role_a user_b localhost role_b @@ -42,7 +42,7 @@ Grants for user_b@localhost GRANT role_b TO 'user_b'@'localhost' GRANT USAGE ON *.* TO 'user_b'@'localhost' GRANT INSERT, UPDATE ON *.* TO 'role_b' -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table 'user' insert into mysql.user (user, host) values ('someuser', 'somehost'); Warnings: @@ -56,10 +56,10 @@ Grants for user_a@localhost GRANT role_a TO 'user_a'@'localhost' GRANT USAGE ON *.* TO 'user_a'@'localhost' GRANT INSERT, UPDATE ON *.* TO 'role_b' -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table 'user' drop role role_a; drop role role_b; -delete from mysql.user where user = 'someuser' && host = 'somehost' order by user; +delete from mysql.user where user = 'someuser' && host = 'somehost'; drop user user_a@localhost; drop user user_b@localhost; diff --git a/mysql-test/suite/roles/set_default_role_for.test b/mysql-test/suite/roles/set_default_role_for.test index 2e798b49733..d7a3372ae23 100644 --- a/mysql-test/suite/roles/set_default_role_for.test +++ b/mysql-test/suite/roles/set_default_role_for.test @@ -44,13 +44,13 @@ set default role role_b for user_b@localhost; change_user 'user_a'; show grants; -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; set default role NONE for current_user; -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; set default role current_role for current_user; -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; # Make sure we can't set a default role not granted to us, using current_user --error ER_INVALID_ROLE @@ -60,7 +60,7 @@ change_user 'user_b'; show grants; --error ER_TABLEACCESS_DENIED_ERROR -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; # Make sure the default role setting worked from root. insert into mysql.user (user, host) values ('someuser', 'somehost'); @@ -73,12 +73,12 @@ change_user 'user_a'; # There is no default role set any more. show grants; --error ER_TABLEACCESS_DENIED_ERROR -select user, host, default_role from mysql.user where user like 'user_%' order by user; +select user, host, default_role from mysql.user where user like 'user_%'; change_user 'root'; drop role role_a; drop role role_b; -delete from mysql.user where user = 'someuser' && host = 'somehost' order by user; +delete from mysql.user where user = 'someuser' && host = 'somehost'; drop user user_a@localhost; drop user user_b@localhost; diff --git a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test b/mysql-test/t/mysql_tzinfo_to_sql_symlink.test index 0c70315c93b..13a4eaaf605 100644 --- a/mysql-test/t/mysql_tzinfo_to_sql_symlink.test +++ b/mysql-test/t/mysql_tzinfo_to_sql_symlink.test @@ -7,11 +7,6 @@ # the updated result. (lp:1161432) --source include/not_wsrep.inc -# Note: The output of mysql_tzinfo_to_sql is different if server is compiled -# with wsrep. Hence a copy of this test has been placed under wsrep suite with -# the updated result. (lp:1161432) ---source include/not_wsrep.inc - --echo # --echo # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above --echo # |