portability fixes for sysvar_* tests

MariaDB · Oct 11, 2014 · 41756a3 · 41756a3
1 parent 2a4e881
commit 41756a3
Show file tree

Hide file tree

Showing 7 changed files with 163 additions and 180 deletions.
diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.inc b/mysql-test/suite/sys_vars/inc/sysvars_server.inc
@@ -1,6 +1,7 @@
 --vertical_results
 
-# because its current value is printed below
+# need stable timestamp, because its current value is printed below
+set time_zone='+00:00';
 set timestamp=unix_timestamp('2014-09-01 13:40:23');
 # ditto
 set pseudo_thread_id=10;
@@ -15,8 +16,13 @@ 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 in ('large_files_support',
+        variable_name not in (
+          'have_openssl',
+          'have_symlink',
+          'hostname',
+          'large_files_support',
           'lower_case_file_system',
+          'lower_case_table_names',
           'open_files_limit',
           'system_time_zone',
           'version_comment',
@@ -31,8 +37,13 @@ select VARIABLE_NAME, VARIABLE_SCOPE, VARIABLE_TYPE, VARIABLE_COMMENT,
        NUMERIC_MIN_VALUE, NUMERIC_MAX_VALUE, NUMERIC_BLOCK_SIZE,
        ENUM_VALUE_LIST, READ_ONLY, COMMAND_LINE_ARGUMENT
   from information_schema.system_variables
-  where variable_name in ('large_files_support',
+  where variable_name in (
+          'have_openssl',
+          'have_symlink',
+          'hostname',
+          'large_files_support',
           'lower_case_file_system',
+          'lower_case_table_names',
           'open_files_limit',
           'system_time_zone',
           'version_comment',

diff --git a/mysql-test/suite/sys_vars/inc/sysvars_server.opt b/mysql-test/suite/sys_vars/inc/sysvars_server.opt
@@ -1 +1 @@
---auto-increment-increment=1
+--auto-increment-increment=1 --loose-thread-pool-size=4
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
@@ -1,6 +1,6 @@
---- suite/sys_vars/r/sysvars_innodb.result	2014-09-01 19:35:26.000000000 +0200
-+++ suite/sys_vars/r/sysvars_innodb,xtradb.reject	2014-09-01 19:37:27.000000000 +0200
-@@ -43,6 +43,20 @@
+--- suite/sys_vars/r/sysvars_innodb.result	2014-10-11 00:05:25.000000000 +0200
++++ suite/sys_vars/r/sysvars_innodb,xtradb.reject	2014-10-11 00:05:51.000000000 +0200
+@@ -47,6 +47,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -21,7 +21,7 @@
  VARIABLE_NAME	INNODB_ADAPTIVE_MAX_SLEEP_DELAY
  SESSION_VALUE	NULL
  GLOBAL_VALUE	150000
-@@ -281,6 +295,20 @@
+@@ -285,6 +299,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -42,7 +42,7 @@
  VARIABLE_NAME	INNODB_BUFFER_POOL_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	8388608
-@@ -358,7 +386,7 @@
+@@ -362,7 +390,7 @@
  DEFAULT_VALUE	ON
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -51,7 +51,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -379,6 +407,104 @@
+@@ -383,6 +411,104 @@
  ENUM_VALUE_LIST	CRC32,STRICT_CRC32,INNODB,STRICT_INNODB,NONE,STRICT_NONE
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -156,7 +156,7 @@
  VARIABLE_NAME	INNODB_CMP_PER_INDEX_ENABLED
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -477,6 +603,20 @@
+@@ -481,6 +607,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -177,7 +177,7 @@
  VARIABLE_NAME	INNODB_DATA_FILE_PATH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ibdata1:12M:autoextend
-@@ -645,6 +785,34 @@
+@@ -649,6 +789,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -212,7 +212,7 @@
  VARIABLE_NAME	INNODB_FAST_SHUTDOWN
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1
-@@ -758,11 +926,11 @@
+@@ -762,11 +930,11 @@
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
@@ -226,7 +226,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
  VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3.
  NUMERIC_MIN_VALUE	0
-@@ -855,6 +1023,20 @@
+@@ -859,6 +1027,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -247,7 +247,7 @@
  VARIABLE_NAME	INNODB_FT_AUX_TABLE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	
-@@ -1051,6 +1233,20 @@
+@@ -1055,6 +1237,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -268,7 +268,7 @@
  VARIABLE_NAME	INNODB_LARGE_PREFIX
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1079,6 +1275,20 @@
+@@ -1083,6 +1279,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -289,7 +289,7 @@
  VARIABLE_NAME	INNODB_LOCKS_UNSAFE_FOR_BINLOG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1107,6 +1317,62 @@
+@@ -1111,6 +1321,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -352,7 +352,7 @@
  VARIABLE_NAME	INNODB_LOG_BUFFER_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1048576
-@@ -1135,6 +1401,20 @@
+@@ -1139,6 +1405,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -373,7 +373,7 @@
  VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -1205,6 +1485,34 @@
+@@ -1209,6 +1489,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -408,7 +408,7 @@
  VARIABLE_NAME	INNODB_MAX_DIRTY_PAGES_PCT
  SESSION_VALUE	NULL
  GLOBAL_VALUE	75
-@@ -1457,6 +1765,62 @@
+@@ -1461,6 +1769,62 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
@@ -471,24 +471,10 @@
  VARIABLE_NAME	INNODB_PURGE_BATCH_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	300
-@@ -1625,6 +1989,90 @@
+@@ -1629,6 +1993,76 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
-+VARIABLE_NAME	INNODB_SCHED_PRIORITY_CLEANER
-+SESSION_VALUE	NULL
-+GLOBAL_VALUE	19
-+GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-+DEFAULT_VALUE	19
-+VARIABLE_SCOPE	GLOBAL
-+VARIABLE_TYPE	BIGINT UNSIGNED
-+VARIABLE_COMMENT	Nice value for the cleaner and LRU manager thread scheduling
-+NUMERIC_MIN_VALUE	0
-+NUMERIC_MAX_VALUE	39
-+NUMERIC_BLOCK_SIZE	0
-+ENUM_VALUE_LIST	NULL
-+READ_ONLY	NO
-+COMMAND_LINE_ARGUMENT	REQUIRED
 +VARIABLE_NAME	INNODB_SCHED_PRIORITY_IO
 +SESSION_VALUE	NULL
 +GLOBAL_VALUE	19
@@ -562,7 +548,7 @@
  VARIABLE_NAME	INNODB_SORT_BUFFER_SIZE
  SESSION_VALUE	NULL
  GLOBAL_VALUE	1048576
-@@ -1674,7 +2122,7 @@
+@@ -1678,7 +2112,7 @@
  DEFAULT_VALUE	nulls_equal
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	ENUM
@@ -571,7 +557,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1877,6 +2325,34 @@
+@@ -1881,6 +2315,34 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	REQUIRED
@@ -606,7 +592,7 @@
  VARIABLE_NAME	INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -1954,7 +2430,7 @@
+@@ -1958,7 +2420,7 @@
  DEFAULT_VALUE	OFF
  VARIABLE_SCOPE	GLOBAL
  VARIABLE_TYPE	BOOLEAN
@@ -615,7 +601,7 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
-@@ -1975,6 +2451,20 @@
+@@ -1979,6 +2441,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -636,7 +622,7 @@
  VARIABLE_NAME	INNODB_USE_MTFLUSH
  SESSION_VALUE	NULL
  GLOBAL_VALUE	OFF
-@@ -2003,6 +2493,20 @@
+@@ -1993,6 +2469,20 @@
  ENUM_VALUE_LIST	NULL
  READ_ONLY	YES
  COMMAND_LINE_ARGUMENT	NONE
@@ -657,7 +643,7 @@
  VARIABLE_NAME	INNODB_USE_SYS_MALLOC
  SESSION_VALUE	NULL
  GLOBAL_VALUE	ON
-@@ -2033,12 +2537,12 @@
+@@ -2023,12 +2513,12 @@
  COMMAND_LINE_ARGUMENT	OPTIONAL
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL

diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -1,6 +1,10 @@
 select * from information_schema.system_variables
-where variable_name like 'innodb%' and not variable_name = 'innodb_disallow_writes'
-  order by variable_name;
+where variable_name like 'innodb%' and
+variable_name not in (
+'innodb_disallow_writes',           # only available WITH_WSREP
+'innodb_sched_priority_cleaner',    # linux only
+'innodb_use_native_aio')            # default value depends on OS
+order by variable_name;
 VARIABLE_NAME	INNODB_ADAPTIVE_FLUSHING
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON
@@ -1989,20 +1993,6 @@ NUMERIC_BLOCK_SIZE	NULL
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NONE
-VARIABLE_NAME	INNODB_USE_NATIVE_AIO
-SESSION_VALUE	NULL
-GLOBAL_VALUE	ON
-GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	ON
-VARIABLE_SCOPE	GLOBAL
-VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Use native AIO if supported on this platform.
-NUMERIC_MIN_VALUE	NULL
-NUMERIC_MAX_VALUE	NULL
-NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	NULL
-READ_ONLY	YES
-COMMAND_LINE_ARGUMENT	NONE
 VARIABLE_NAME	INNODB_USE_SYS_MALLOC
 SESSION_VALUE	NULL
 GLOBAL_VALUE	ON