[Commits] 40dbf7d: fix test suite

sanja at mariadb.com sanja at mariadb.com
Fri Mar 13 18:08:55 EET 2015


revision-id: 40dbf7d9d5851fbbdec830c85efa286083137ccb
parent(s): 7ceff99ff25b74bb188848ce0e5f9e2f1ddac3d0
committer: Oleksandr Byelkin
branch nick: server
timestamp: 2015-03-13 17:08:52 +0100
message:

fix test suite

---
 mysql-test/suite/sys_vars/inc/sysvars_server.inc   |  5 ++-
 .../sys_vars/r/sysvars_server_embedded.result      | 52 ++++++++++------------
 .../sys_vars/r/sysvars_server_notembedded.result   | 25 ++++++++++-
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
index 3a9a312..cb06b40 100644
--- a/mysql-test/suite/sys_vars/inc/sysvars_server.inc
+++ b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -17,7 +17,6 @@ select * from information_schema.system_variables
   where variable_name not like 'aria%' and
         variable_name not like 'debug%' and
         variable_name not like 'wsrep%' and
-        variable_name not like 'rand_seed%%' and
         variable_name not in (
           'have_openssl',
           'have_symlink',
@@ -26,6 +25,8 @@ select * from information_schema.system_variables
           'lower_case_file_system',
           'lower_case_table_names',
           'open_files_limit',
+          'rand_seed1',
+          'rand_seed2',
           'system_time_zone',
           'version_comment',
           'version_compile_machine', 'version_compile_os',
@@ -47,6 +48,8 @@ select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
           'lower_case_file_system',
           'lower_case_table_names',
           'open_files_limit',
+          'rand_seed1',
+          'rand_seed2',
           'system_time_zone',
           'version_comment',
           'version_compile_machine', 'version_compile_os',
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 59aba01..7c4bcf6 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -15,6 +15,8 @@ variable_name not in (
 'lower_case_file_system',
 'lower_case_table_names',
 'open_files_limit',
+'rand_seed1',
+'rand_seed2',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -3087,34 +3089,6 @@ NUMERIC_BLOCK_SIZE	1024
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	RAND_SEED1
-SESSION_VALUE	0
-GLOBAL_VALUE	NULL
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	0
-VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	NULL
-VARIABLE_NAME	RAND_SEED2
-SESSION_VALUE	0
-GLOBAL_VALUE	NULL
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	0
-VARIABLE_SCOPE	SESSION ONLY
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
-NUMERIC_MIN_VALUE	0
-NUMERIC_MAX_VALUE	18446744073709551615
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	RANGE_ALLOC_BLOCK_SIZE
 SESSION_VALUE	4096
 GLOBAL_VALUE	4096
@@ -4051,6 +4025,8 @@ where variable_name in (
 'lower_case_file_system',
 'lower_case_table_names',
 'open_files_limit',
+'rand_seed1',
+'rand_seed2',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -4127,6 +4103,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	RAND_SEED1
+VARIABLE_SCOPE	SESSION ONLY
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
+VARIABLE_NAME	RAND_SEED2
+VARIABLE_SCOPE	SESSION ONLY
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SYSTEM_TIME_ZONE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 156cec9..3bf4867 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -7,7 +7,6 @@ select * from information_schema.system_variables
 where variable_name not like 'aria%' and
 variable_name not like 'debug%' and
 variable_name not like 'wsrep%' and
-variable_name not like 'rand_seed%%' and
 variable_name not in (
 'have_openssl',
 'have_symlink',
@@ -16,6 +15,8 @@ variable_name not in (
 'lower_case_file_system',
 'lower_case_table_names',
 'open_files_limit',
+'rand_seed1',
+'rand_seed2',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -4752,6 +4753,8 @@ where variable_name in (
 'lower_case_file_system',
 'lower_case_table_names',
 'open_files_limit',
+'rand_seed1',
+'rand_seed2',
 'system_time_zone',
 'version_comment',
 'version_compile_machine', 'version_compile_os',
@@ -4828,6 +4831,26 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	RAND_SEED1
+VARIABLE_SCOPE	SESSION ONLY
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
+VARIABLE_NAME	RAND_SEED2
+VARIABLE_SCOPE	SESSION ONLY
+VARIABLE_TYPE	BIGINT UNSIGNED
+VARIABLE_COMMENT	Sets the internal state of the RAND() generator for replication purposes
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	18446744073709551615
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	SYSTEM_TIME_ZONE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR


More information about the commits mailing list