After-merge test result fix

MariaDB · Feb 3, 2018 · a988c70 · a988c70
1 parent c383418
commit a988c70
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
@@ -829,10 +829,24 @@
  VARIABLE_COMMENT	Page size to use for all InnoDB tablespaces.
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	65536
-@@ -1727,13 +2035,69 @@
+@@ -1727,13 +2035,83 @@
  ENUM_VALUE_LIST	OFF,ON
  READ_ONLY	NO
  COMMAND_LINE_ARGUMENT	OPTIONAL
++VARIABLE_NAME	INNODB_PRINT_LOCK_WAIT_TIMEOUT_INFO
++SESSION_VALUE	NULL
++GLOBAL_VALUE	OFF
++GLOBAL_VALUE_ORIGIN	COMPILE-TIME
++DEFAULT_VALUE	OFF
++VARIABLE_SCOPE	GLOBAL
++VARIABLE_TYPE	BOOLEAN
++VARIABLE_COMMENT	Print lock wait timeout info to MySQL error log (off by default)
++NUMERIC_MIN_VALUE	NULL
++NUMERIC_MAX_VALUE	NULL
++NUMERIC_BLOCK_SIZE	NULL
++ENUM_VALUE_LIST	OFF,ON
++READ_ONLY	NO
++COMMAND_LINE_ARGUMENT	OPTIONAL
 +VARIABLE_NAME	INNODB_PRIORITY_CLEANER
 +SESSION_VALUE	NULL
 +GLOBAL_VALUE	OFF
@@ -1222,7 +1236,7 @@
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
 -GLOBAL_VALUE	5.6.37
-+GLOBAL_VALUE	5.6.36-82.2
++GLOBAL_VALUE	5.6.36-83.0
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL