diff options
96 files changed, 256 insertions, 462 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 5e59b71fd91..a74802c2314 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -111,8 +111,27 @@ MACRO(MYSQL_ADD_PLUGIN) SET(ARG_DEPENDENCIES) ENDIF() SET(BUILD_PLUGIN 1) + + IF(NOT ARG_MODULE_OUTPUT_NAME) + IF(ARG_STORAGE_ENGINE) + SET(ARG_MODULE_OUTPUT_NAME "ha_${target}") + ELSE() + SET(ARG_MODULE_OUTPUT_NAME "${target}") + ENDIF() + ENDIF() + # Build either static library or module IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY) + + IF(CMAKE_GENERATOR MATCHES "Makefiles") + # If there is a shared library from previous shared build, + # remove it. This is done just for mysql-test-run.pl + # so it does not try to use stale shared lib as plugin + # in test. + FILE(REMOVE + ${CMAKE_CURRENT_BINARY_DIR}/${ARG_MODULE_OUTPUT_NAME}${CMAKE_SHARED_MODULE_SUFFIX}) + ENDIF() + ADD_LIBRARY(${target} STATIC ${SOURCES}) SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER") DTRACE_INSTRUMENT(${target}) @@ -159,14 +178,7 @@ MACRO(MYSQL_ADD_PLUGIN) PARENT_SCOPE) ENDIF() ELSEIF(NOT WITHOUT_${plugin} AND NOT ARG_STATIC_ONLY AND NOT WITHOUT_DYNAMIC_PLUGINS) - IF(NOT ARG_MODULE_OUTPUT_NAME) - IF(ARG_STORAGE_ENGINE) - SET(ARG_MODULE_OUTPUT_NAME "ha_${target}") - ELSE() - SET(ARG_MODULE_OUTPUT_NAME "${target}") - ENDIF() - ENDIF() - + ADD_VERSION_INFO(${target} MODULE SOURCES) ADD_LIBRARY(${target} MODULE ${SOURCES}) DTRACE_INSTRUMENT(${target}) diff --git a/cmd-line-utils/libedit/CMakeLists.txt b/cmd-line-utils/libedit/CMakeLists.txt index c488fa34512..1f9aa29fb4a 100644 --- a/cmd-line-utils/libedit/CMakeLists.txt +++ b/cmd-line-utils/libedit/CMakeLists.txt @@ -186,6 +186,6 @@ SET(LIBEDIT_SOURCES ${AHDR} ${LIBEDIT_EXTRA_SOURCES} ) -ADD_LIBRARY(edit ${LIBEDIT_SOURCES}) +ADD_LIBRARY(edit STATIC ${LIBEDIT_SOURCES}) TARGET_LINK_LIBRARIES(edit ${CURSES_LIBRARY}) diff --git a/cmd-line-utils/readline/CMakeLists.txt b/cmd-line-utils/readline/CMakeLists.txt index abe83b5a85c..c06b9c08c47 100644 --- a/cmd-line-utils/readline/CMakeLists.txt +++ b/cmd-line-utils/readline/CMakeLists.txt @@ -20,7 +20,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNO_KILL_INTR) INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) -ADD_LIBRARY(readline +ADD_LIBRARY(readline STATIC readline.c funmap.c keymaps.c diff --git a/mysql-test/include/have_32bit.inc b/mysql-test/include/have_32bit.inc deleted file mode 100644 index 66684fb5325..00000000000 --- a/mysql-test/include/have_32bit.inc +++ /dev/null @@ -1,16 +0,0 @@ -# Created by Horst Hunger 2008-04-15 -# see also have_64bit.inc - ---disable_query_log ---disable_warnings -let $save = `SELECT @@global.sort_buffer_size`; -SET @@global.sort_buffer_size = 4294967296; -let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`; -eval SET @@global.sort_buffer_size = $save; ---enable_warnings ---enable_query_log -if (!$mach32) -{ - skip Need a 32 bit machine/binary; -} - diff --git a/mysql-test/include/have_32bit_ulong.inc b/mysql-test/include/have_32bit_ulong.inc new file mode 100644 index 00000000000..0323b8a9888 --- /dev/null +++ b/mysql-test/include/have_32bit_ulong.inc @@ -0,0 +1,16 @@ +# Created by Horst Hunger 2008-04-15 +# see also have_64bit_ulong.inc + +--disable_query_log +--disable_warnings +let $save = `SELECT @@pseudo_thread_id`; +SET @@pseudo_thread_id = 4294967296; +let $mach32 = `SELECT @@pseudo_thread_id <= 4294967295`; +eval SET @@pseudo_thread_id = $save; +--enable_warnings +--enable_query_log +if (!$mach32) +{ + skip Need a 32 bit unsigned long; +} + diff --git a/mysql-test/include/have_64bit.inc b/mysql-test/include/have_64bit.inc deleted file mode 100644 index cbba5e1d338..00000000000 --- a/mysql-test/include/have_64bit.inc +++ /dev/null @@ -1,14 +0,0 @@ -# Created by Horst Hunger 2008-04-15 -# see also have_32bit.inc - ---disable_query_log -let $save = `SELECT @@session.sort_buffer_size`; -SET @@session.sort_buffer_size = 4294967296; -let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`; -eval SET @@session.sort_buffer_size = $save; ---enable_query_log -if (!$mach64) -{ - skip Need a 64 binary ; -} - diff --git a/mysql-test/include/have_64bit_ulong.inc b/mysql-test/include/have_64bit_ulong.inc new file mode 100644 index 00000000000..529ab225e4f --- /dev/null +++ b/mysql-test/include/have_64bit_ulong.inc @@ -0,0 +1,14 @@ +# Created by Horst Hunger 2008-04-15 +# see also have_32bit_ulong.inc + +--disable_query_log +let $save = `SELECT @@pseudo_thread_id`; +SET @@pseudo_thread_id = 4294967296; +let $mach64 = `SELECT @@pseudo_thread_id > 4294967295`; +eval SET @@pseudo_thread_id = $save; +--enable_query_log +if (!$mach64) +{ + skip Need a 64 unsigned long ; +} + diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 1248e72f3b9..a690ca4b334 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -159,7 +159,7 @@ INSERT INTO global_suppressions VALUES /* innodb foreign key tests that fail in ALTER or RENAME produce this */ ("InnoDB: Error: in ALTER TABLE `test`.`t[123]`"), ("InnoDB: Error: in RENAME TABLE table `test`.`t1`"), - ("InnoDB: Error: table `test`.`t[123]` does not exist in the InnoDB internal"), + ("InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"), /* BUG#32080 - Excessive warnings on Solaris: setrlimit could not diff --git a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result index 10d57aad1b0..c4c487ef348 100644 --- a/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result @@ -38,10 +38,6 @@ select @@global.aria_repair_threads; @@global.aria_repair_threads 1 set session aria_repair_threads=cast(-1 as unsigned int); -Warnings: -Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1292 Truncated incorrect aria_repair_threads value: '18446744073709551615' select @@session.aria_repair_threads; @@session.aria_repair_threads 128 diff --git a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result index 0e0a2429f41..cf067c7e7b6 100644 --- a/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result +++ b/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result @@ -38,11 +38,7 @@ select @@global.aria_sort_buffer_size; @@global.aria_sort_buffer_size 4 set session aria_sort_buffer_size=cast(-1 as unsigned int); -Warnings: -Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement -Warning 1292 Truncated incorrect aria_sort_buffer_size value: '18446744073709551615' select @@session.aria_sort_buffer_size; @@session.aria_sort_buffer_size -4294967295 +18446744073709551615 SET @@global.aria_sort_buffer_size = @start_global_value; diff --git a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result index d378765d96f..915a2383435 100644 --- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result @@ -59,7 +59,7 @@ Warnings: Warning 1292 Truncated incorrect binlog_cache_size value: '42949672950' SELECT @@global.binlog_cache_size; @@global.binlog_cache_size -4294963200 +42949668864 'Bug: Errors are not coming on assigning invalid values to variable' SET @@global.binlog_cache_size = ON; ERROR 42000: Incorrect argument type to variable 'binlog_cache_size' @@ -97,7 +97,7 @@ SELECT @@binlog_cache_size = @@global.binlog_cache_size; SET binlog_cache_size = 1; ERROR HY000: Variable 'binlog_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET global.binlog_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_cache_size = 1' at line 1 SELECT global.binlog_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_cache_size = @@session.binlog_cache_size; diff --git a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result index 604f671d5a4..8f1e519dab4 100644 --- a/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result @@ -59,7 +59,7 @@ Warnings: Warning 1292 Truncated incorrect binlog_stmt_cache_size value: '42949672950' SELECT @@global.binlog_stmt_cache_size; @@global.binlog_stmt_cache_size -4294963200 +42949668864 'Bug: Errors are not coming on assigning invalid values to variable' SET @@global.binlog_stmt_cache_size = ON; ERROR 42000: Incorrect argument type to variable 'binlog_stmt_cache_size' @@ -97,7 +97,7 @@ SELECT @@binlog_stmt_cache_size = @@global.binlog_stmt_cache_size; SET binlog_stmt_cache_size = 1; ERROR HY000: Variable 'binlog_stmt_cache_size' is a GLOBAL variable and should be set with SET GLOBAL SET global.binlog_stmt_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'binlog_stmt_cache_size = 1' at line 1 SELECT global.binlog_stmt_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT binlog_stmt_cache_size = @@session.binlog_stmt_cache_size; diff --git a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result index 497fe531fec..b332d01f900 100644 --- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result @@ -62,11 +62,9 @@ SELECT @@session.bulk_insert_buffer_size; 429496 '#------------------FN_DYNVARS_007_05-----------------------#' SET @@global.bulk_insert_buffer_size = 42949672950; -Warnings: -Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '42949672950' SELECT @@global.bulk_insert_buffer_size; @@global.bulk_insert_buffer_size -4294967295 +42949672950 SET @@global.bulk_insert_buffer_size = -1024; Warnings: Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-1024' @@ -80,11 +78,9 @@ ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size' SET @@global.bulk_insert_buffer_size = 429496.10; ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size' SET @@session.bulk_insert_buffer_size = 42949672950; -Warnings: -Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '42949672950' SELECT @@session.bulk_insert_buffer_size; @@session.bulk_insert_buffer_size -4294967295 +42949672950 SET @@session.bulk_insert_buffer_size = -2; Warnings: Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-2' @@ -138,11 +134,11 @@ SELECT @@bulk_insert_buffer_size; @@bulk_insert_buffer_size 1 SET local.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT local.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'local' in field list SET session.bulk_insert_buffer_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'bulk_insert_buffer_size = 1' at line 1 SELECT session.bulk_insert_buffer_size; ERROR 42S02: Unknown table 'session' in field list SELECT bulk_insert_buffer_size = @@session.bulk_insert_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result index 13f5a901f6d..70f338ad305 100644 --- a/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result +++ b/mysql-test/suite/sys_vars/r/debug_crc_break_basic.result @@ -33,8 +33,6 @@ select @@global.debug_crc_break; @@global.debug_crc_break 0 set global debug_crc_break=cast(-1 as unsigned int); -Warnings: -Note 1105 Cast to unsigned converted negative integer to it's positive complement select @@global.debug_crc_break; @@global.debug_crc_break 18446744073709551615 diff --git a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result index 3da10bc8416..6acc2398bbd 100644 --- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result +++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result @@ -96,11 +96,11 @@ SELECT @@delayed_insert_limit; @@delayed_insert_limit 1 SET local.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT local.delayed_insert_limit; ERROR 42S02: Unknown table 'local' in field list SET global.delayed_insert_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_insert_limit = 1' at line 1 SELECT global.delayed_insert_limit; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_insert_limit = @@session.delayed_insert_limit; diff --git a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result index f4448b08b1f..04aad26f0e8 100644 --- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result @@ -94,11 +94,11 @@ SELECT @@delayed_queue_size; @@delayed_queue_size 1 SET local.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT local.delayed_queue_size; ERROR 42S02: Unknown table 'local' in field list SET global.delayed_queue_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'delayed_queue_size = 1' at line 1 SELECT global.delayed_queue_size; ERROR 42S02: Unknown table 'global' in field list SELECT delayed_queue_size = @@session.delayed_queue_size; diff --git a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result index af3dd553862..fda265910f9 100644 --- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result @@ -73,17 +73,17 @@ Warnings: Warning 1292 Truncated incorrect join_buffer_size value: '42949672951' SELECT @@global.join_buffer_size; @@global.join_buffer_size -4294967168 +42949672832 SET @@global.join_buffer_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'join_buffer_size' SELECT @@global.join_buffer_size; @@global.join_buffer_size -4294967168 +42949672832 SET @@global.join_buffer_size = test; ERROR 42000: Incorrect argument type to variable 'join_buffer_size' SELECT @@global.join_buffer_size; @@global.join_buffer_size -4294967168 +42949672832 SET @@session.join_buffer_size = 0; Warnings: Warning 1292 Truncated incorrect join_buffer_size value: '0' @@ -107,17 +107,17 @@ Warnings: Warning 1292 Truncated incorrect join_buffer_size value: '42949672951' SELECT @@session.join_buffer_size; @@session.join_buffer_size -4294967168 +42949672832 SET @@session.join_buffer_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'join_buffer_size' SELECT @@session.join_buffer_size; @@session.join_buffer_size -4294967168 +42949672832 SET @@session.join_buffer_size = test; ERROR 42000: Incorrect argument type to variable 'join_buffer_size' SELECT @@session.join_buffer_size; @@session.join_buffer_size -4294967168 +42949672832 '#------------------FN_DYNVARS_053_06-----------------------#' SELECT @@global.join_buffer_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES diff --git a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result index 9df9f56bd1f..f2a59e419e4 100644 --- a/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result +++ b/mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result @@ -116,11 +116,11 @@ SELECT @@key_cache_age_threshold; @@key_cache_age_threshold 100 SET local.key_cache_age_threshold = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 SELECT local.key_cache_age_threshold; ERROR 42S02: Unknown table 'local' in field list SET global.key_cache_age_threshold = 10; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_cache_age_threshold = 10' at line 1 SELECT global.key_cache_age_threshold; ERROR 42S02: Unknown table 'global' in field list SELECT key_cache_age_threshold = @@session.key_cache_age_threshold; diff --git a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result index 19f6f12a50b..be1a58394b8 100644 --- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result +++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_32.result @@ -119,11 +119,11 @@ SELECT @@max_connect_errors; @@max_connect_errors 5000 SET local.max_connect_errors = 7000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 7000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 7000' at line 1 SELECT local.max_connect_errors; ERROR 42S02: Unknown table 'local' in field list SET global.max_connect_errors = 8000; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'max_connect_errors = 8000' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'max_connect_errors = 8000' at line 1 SELECT global.max_connect_errors; ERROR 42S02: Unknown table 'global' in field list SELECT max_connect_errors = @@session.max_connect_errors; diff --git a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result index 33222f781f2..e7cda15215c 100644 --- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result +++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_32.result @@ -8,87 +8,123 @@ SELECT @start_session_value; 256 '#--------------------FN_DYNVARS_090_01-------------------------#' SET @@global.multi_range_count = 100; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SET @@global.multi_range_count = DEFAULT; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 256 SET @@session.multi_range_count = 200; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SET @@session.multi_range_count = DEFAULT; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 256 '#--------------------FN_DYNVARS_090_02-------------------------#' SET @@global.multi_range_count = DEFAULT; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count = 256; @@global.multi_range_count = 256 1 SET @@session.multi_range_count = DEFAULT; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count = 256; @@session.multi_range_count = 256 1 '#--------------------FN_DYNVARS_090_03-------------------------#' SET @@global.multi_range_count = 1; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 60020; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 60020 SET @@global.multi_range_count = 65535; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 65535 SET @@global.multi_range_count = 4294967295; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 4294967295 SET @@global.multi_range_count = 4294967294; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 4294967294 '#--------------------FN_DYNVARS_090_04-------------------------#' SET @@session.multi_range_count = 1; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 50050; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 50050 SET @@session.multi_range_count = 65535; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 65535 SET @@session.multi_range_count = 4294967295; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967295 SET @@session.multi_range_count = 4294967294; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 4294967294 '#------------------FN_DYNVARS_090_05-----------------------#' SET @@global.multi_range_count = 0; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 4294967296; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '4294967296' SELECT @@global.multi_range_count; @@global.multi_range_count 4294967295 SET @@global.multi_range_count = -1024; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '-1024' SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = 429496729500; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '429496729500' SELECT @@global.multi_range_count; @@global.multi_range_count @@ -105,26 +141,30 @@ SELECT @@global.multi_range_count; 4294967295 SET @@session.multi_range_count = 0; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 4294967296; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '4294967296' SELECT @@session.multi_range_count; @@session.multi_range_count 4294967295 SET @@session.multi_range_count = -1; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '-1' SELECT @@session.multi_range_count; @@session.multi_range_count 1 SET @@session.multi_range_count = 65530.34.; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '.' at line 1 SET @@session.multi_range_count = 4294967295021; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '4294967295021' SELECT @@session.multi_range_count; @@session.multi_range_count @@ -149,22 +189,29 @@ WHERE VARIABLE_NAME='multi_range_count'; 1 '#------------------FN_DYNVARS_090_08-----------------------#' SET @@global.multi_range_count = TRUE; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 1 SET @@global.multi_range_count = FALSE; Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead Warning 1292 Truncated incorrect multi_range_count value: '0' SELECT @@global.multi_range_count; @@global.multi_range_count 1 '#---------------------FN_DYNVARS_090_09----------------------#' SET @@global.multi_range_count = 10; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count = @@global.multi_range_count; @@multi_range_count = @@global.multi_range_count 0 '#---------------------FN_DYNVARS_090_10----------------------#' SET @@multi_range_count = 100; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count = @@local.multi_range_count; @@multi_range_count = @@local.multi_range_count 1 @@ -173,6 +220,8 @@ SELECT @@local.multi_range_count = @@session.multi_range_count; 1 '#---------------------FN_DYNVARS_090_11----------------------#' SET multi_range_count = 1; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@multi_range_count; @@multi_range_count 1 @@ -183,10 +232,14 @@ ERROR 42S02: Unknown table 'session' in field list SELECT multi_range_count = @@session.multi_range_count; ERROR 42S22: Unknown column 'multi_range_count' in 'field list' SET @@global.multi_range_count = @start_global_value; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@global.multi_range_count; @@global.multi_range_count 256 SET @@session.multi_range_count = @start_session_value; +Warnings: +Warning 1287 The syntax '@@multi_range_count' is deprecated and will be removed in MariaDB 5.7. Please use '@@mrr_buffer_size' instead SELECT @@session.multi_range_count; @@session.multi_range_count 256 diff --git a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result index 6189a55e86e..eb6851baa93 100644 --- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result @@ -41,18 +41,6 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1025' SELECT @@global.query_alloc_block_size; @@global.query_alloc_block_size 1024 -SET @@global.query_alloc_block_size = 4294967295; -Warnings: -Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295' -SELECT @@global.query_alloc_block_size; -@@global.query_alloc_block_size -4294966272 -SET @@global.query_alloc_block_size = 4294967294; -Warnings: -Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294' -SELECT @@global.query_alloc_block_size; -@@global.query_alloc_block_size -4294966272 SET @@global.query_alloc_block_size = 65536; SELECT @@global.query_alloc_block_size; @@global.query_alloc_block_size @@ -68,18 +56,6 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1025' SELECT @@session.query_alloc_block_size; @@session.query_alloc_block_size 1024 -SET @@session.query_alloc_block_size = 4294967295; -Warnings: -Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295' -SELECT @@session.query_alloc_block_size; -@@session.query_alloc_block_size -4294966272 -SET @@session.query_alloc_block_size = 4294967294; -Warnings: -Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294' -SELECT @@session.query_alloc_block_size; -@@session.query_alloc_block_size -4294966272 SET @@session.query_alloc_block_size = 655536; Warnings: Warning 1292 Truncated incorrect query_alloc_block_size value: '655536' @@ -105,22 +81,16 @@ Warning 1292 Truncated incorrect query_alloc_block_size value: '1023' SELECT @@global.query_alloc_block_size; @@global.query_alloc_block_size 1024 -SET @@global.query_alloc_block_size = 4294967296; -Warnings: -Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967296' -SELECT @@global.query_alloc_block_size; -@@global.query_alloc_block_size -4294966272 SET @@global.query_alloc_block_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size' SELECT @@global.query_alloc_block_size; @@global.query_alloc_block_size -4294966272 +1024 SET @@global.query_alloc_block_size = test; ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size' SELECT @@global.query_alloc_block_size; @@global.query_alloc_block_size -4294966272 +1024 SET @@session.query_alloc_block_size = 64; Warnings: Warning 1292 Truncated incorrect query_alloc_block_size value: '64' diff --git a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result index 074075dd2f7..892bc306bcb 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result +++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_32.result @@ -114,11 +114,11 @@ SELECT @@query_cache_limit; @@query_cache_limit 1 SET local.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT local.query_cache_limit; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_limit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_limit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_limit = 1' at line 1 SELECT global.query_cache_limit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_limit = @@session.query_cache_limit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result index c408a39fdc0..3d2c02c48fc 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result +++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_32.result @@ -120,11 +120,11 @@ SELECT @@query_cache_min_res_unit; @@query_cache_min_res_unit 512 SET local.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT local.query_cache_min_res_unit; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_min_res_unit = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_min_res_unit = 1' at line 1 SELECT global.query_cache_min_res_unit; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_min_res_unit = @@session.query_cache_min_res_unit; diff --git a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result index 6edaf22302a..ef302c500d5 100644 --- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result @@ -69,6 +69,7 @@ Warning 1292 Truncated incorrect query_cache_size value: '-1024' SELECT @@global.query_cache_size; @@global.query_cache_size 0 +<<<<<<< TREE SET @@global.query_cache_size = 42949672950; Warnings: Warning 1292 Truncated incorrect query_cache_size value: '42949672950' @@ -76,6 +77,8 @@ Warning 1282 Query cache failed to set size 4294966272; new query cache size is SELECT @@global.query_cache_size; @@global.query_cache_size 0 +======= +>>>>>>> MERGE-SOURCE SET @@global.query_cache_size = ON; ERROR 42000: Incorrect argument type to variable 'query_cache_size' SELECT @@global.query_cache_size; @@ -128,11 +131,11 @@ SELECT @@query_cache_size; @@query_cache_size 0 SET local.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT local.query_cache_size; ERROR 42S02: Unknown table 'local' in field list SET global.query_cache_size = 1; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'query_cache_size = 1' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'query_cache_size = 1' at line 1 SELECT global.query_cache_size; ERROR 42S02: Unknown table 'global' in field list SELECT query_cache_size = @@session.query_cache_size; diff --git a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result index f5b771c47cc..b3572eda3c7 100644 --- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result +++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result @@ -5,42 +5,42 @@ SELECT @start_global_value; '#--------------------FN_DYNVARS_142_01-------------------------#' SET @@global.rpl_recovery_rank = 500000; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SET @@global.rpl_recovery_rank = DEFAULT; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 '#--------------------FN_DYNVARS_142_02-------------------------#' SET @@global.rpl_recovery_rank = 0; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = 1024; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 1024 SET @@global.rpl_recovery_rank = 123456789; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 123456789 SET @@global.rpl_recovery_rank = 2147483648*2; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '4294967296' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 4294967295 SET @@global.rpl_recovery_rank = 2147483648*1024; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '2199023255552' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank @@ -50,7 +50,7 @@ SELECT @@global.rpl_recovery_rank; 4294967295 SET @@global.rpl_recovery_rank = 2147483648*2147483648; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '4611686018427387904' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank @@ -65,21 +65,21 @@ ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set '#------------------FN_DYNVARS_142_04-----------------------#' SET @@global.rpl_recovery_rank = -1; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-1' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = -2147483648; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483648' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 SET @@global.rpl_recovery_rank = -2147483649; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483649' SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank @@ -93,7 +93,7 @@ ERROR 42000: Incorrect argument type to variable 'rpl_recovery_rank' '#------------------FN_DYNVARS_142_05-----------------------#' SET @@global.rpl_recovery_rank = 3000; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='rpl_recovery_rank'; @@ -108,20 +108,20 @@ count(VARIABLE_VALUE) '#------------------FN_DYNVARS_142_07-----------------------#' SET @@global.rpl_recovery_rank = TRUE; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 1 SET @@global.rpl_recovery_rank = FALSE; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 '#---------------------FN_DYNVARS_001_08----------------------#' SET @@global.rpl_recovery_rank = 512; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@rpl_recovery_rank = @@global.rpl_recovery_rank; @@rpl_recovery_rank = @@global.rpl_recovery_rank 1 @@ -135,10 +135,10 @@ SELECT @@rpl_recovery_rank; 512 SET global rpl_recovery_rank = 64; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SET @@global.rpl_recovery_rank = @start_global_value; Warnings: -Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0. +Warning 1287 The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MariaDB 7.0. SELECT @@global.rpl_recovery_rank; @@global.rpl_recovery_rank 0 diff --git a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result index cddfa9f52c9..b492a343a9b 100644 --- a/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result @@ -62,21 +62,21 @@ SELECT @@global.sort_buffer_size; SET @@global.sort_buffer_size = -1024; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -32768 +1024 SET @@global.sort_buffer_size = 4294967296; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -4294967295 +4294967296 SET @@global.sort_buffer_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'sort_buffer_size' SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -4294967295 +4294967296 SET @@global.sort_buffer_size = test; ERROR 42000: Incorrect argument type to variable 'sort_buffer_size' SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -4294967295 +4294967296 SET @@session.sort_buffer_size = 32775; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size @@ -84,13 +84,13 @@ SELECT @@session.sort_buffer_size; SET @@session.sort_buffer_size = -2; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -32768 +1024 SET @@session.sort_buffer_size = 65530.34; ERROR 42000: Incorrect argument type to variable 'sort_buffer_size' SET @@session.sort_buffer_size = 4294967296; SELECT @@session.sort_buffer_size; @@session.sort_buffer_size -4294967295 +4294967296 SET @@session.sort_buffer_size = test; ERROR 42000: Incorrect argument type to variable 'sort_buffer_size' '#------------------FN_DYNVARS_151_06-----------------------#' @@ -107,11 +107,11 @@ INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME='sort_buffer_size'; SET @@global.sort_buffer_size = TRUE; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -32768 +1024 SET @@global.sort_buffer_size = FALSE; SELECT @@global.sort_buffer_size; @@global.sort_buffer_size -32768 +1024 '#---------------------FN_DYNVARS_151_09----------------------#' SET @@global.sort_buffer_size = 9000; SELECT @@sort_buffer_size = @@global.sort_buffer_size; @@ -129,7 +129,7 @@ SELECT @@local.sort_buffer_size = @@session.sort_buffer_size; SET sort_buffer_size = 9100; SELECT @@sort_buffer_size; @@sort_buffer_size -32768 +9100 SELECT local.sort_buffer_size; ERROR 42S02: Unknown table 'local' in field list SELECT session.sort_buffer_size; diff --git a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result index 4912653a8e5..cbd25426408 100644 --- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result +++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result @@ -6,7 +6,6 @@ SET @start_session_value = @@session.transaction_prealloc_size; SELECT @start_session_value; @start_session_value 4096 -'Bug# 34876: This variable has invalid default value as compared to documentation'; '#--------------------FN_DYNVARS_005_01-------------------------#' SET @@global.transaction_prealloc_size = 100; Warnings: @@ -37,23 +36,19 @@ SELECT @@global.transaction_prealloc_size; @@global.transaction_prealloc_size 1024 SET @@global.transaction_prealloc_size = 60020; +Warnings: +Warning 1292 Truncated incorrect transaction_prealloc_size value: '60020' SELECT @@global.transaction_prealloc_size; @@global.transaction_prealloc_size 59392 -SET @@global.transaction_prealloc_size = 4294966272; -SELECT @@global.transaction_prealloc_size; -@@global.transaction_prealloc_size -4294966272 '#--------------------FN_DYNVARS_005_04-------------------------#' SET @@session.transaction_prealloc_size = 1024; SELECT @@session.transaction_prealloc_size; @@session.transaction_prealloc_size 1024 -SET @@session.transaction_prealloc_size =4294966272; -SELECT @@session.transaction_prealloc_size; -@@session.transaction_prealloc_size -4294966272 SET @@session.transaction_prealloc_size = 65535; +Warnings: +Warning 1292 Truncated incorrect transaction_prealloc_size value: '65535' SELECT @@session.transaction_prealloc_size; @@session.transaction_prealloc_size 64512 @@ -70,7 +65,6 @@ Warning 1292 Truncated incorrect transaction_prealloc_size value: '-1024' SELECT @@global.transaction_prealloc_size; @@global.transaction_prealloc_size 1024 -'Bug # 34837: Errors are not coming on assigning invalid values to variable'; SET @@global.transaction_prealloc_size = ON; ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size' SET @@global.transaction_prealloc_size = OFF; @@ -115,12 +109,6 @@ SELECT @@session.transaction_prealloc_size; 1024 SET @@session.transaction_prealloc_size = "Test"; ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size' -SET @@session.transaction_prealloc_size = 123456789031; -Warnings: -Warning 1292 Truncated incorrect transaction_prealloc_size value: '123456789031' -SELECT @@session.transaction_prealloc_size; -@@session.transaction_prealloc_size -4294966272 '#------------------FN_DYNVARS_005_06-----------------------#' SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES @@ -140,7 +128,7 @@ Warnings: Warning 1292 Truncated incorrect transaction_prealloc_size value: '10' SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size; @@transaction_prealloc_size = @@global.transaction_prealloc_size -0 +1 '#---------------------FN_DYNVARS_001_10----------------------#' SET @@transaction_prealloc_size = 100; Warnings: @@ -153,6 +141,8 @@ SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size; 1 '#---------------------FN_DYNVARS_001_11----------------------#' SET transaction_prealloc_size = 1027; +Warnings: +Warning 1292 Truncated incorrect transaction_prealloc_size value: '1027' SELECT @@transaction_prealloc_size; @@transaction_prealloc_size 1024 diff --git a/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test b/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test index 2d8dcc4eff5..3fc9c94fc84 100644 --- a/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test +++ b/mysql-test/suite/sys_vars/t/aria_pagecache_age_threshold_basic.test @@ -42,6 +42,7 @@ select @@global.aria_pagecache_age_threshold; set global aria_pagecache_age_threshold=@@global.aria_pagecache_age_threshold + 100; select @@global.aria_pagecache_age_threshold; set global aria_pagecache_age_threshold=cast(-1 as unsigned int); +--replace_result 4294967200 18446744073709551600 select @@global.aria_pagecache_age_threshold; SET @@global.aria_pagecache_age_threshold = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test b/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test index 476bd0b4cb2..8d075f3150c 100644 --- a/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test +++ b/mysql-test/suite/sys_vars/t/aria_repair_threads_basic.test @@ -36,7 +36,10 @@ set global aria_repair_threads="foo"; # set global aria_repair_threads=0; select @@global.aria_repair_threads; +--disable_warnings set session aria_repair_threads=cast(-1 as unsigned int); +--enable_warnings +--replace_result 4294967295 18446744073709551615 select @@session.aria_repair_threads; SET @@global.aria_repair_threads = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test index 699f6ae8e20..818d66328f8 100644 --- a/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test +++ b/mysql-test/suite/sys_vars/t/aria_sort_buffer_size_basic.test @@ -36,7 +36,10 @@ set global aria_sort_buffer_size="foo"; # set global aria_sort_buffer_size=0; select @@global.aria_sort_buffer_size; +--disable_warnings set session aria_sort_buffer_size=cast(-1 as unsigned int); +--enable_warnings +--replace_result 4294967295 18446744073709551615 select @@session.aria_sort_buffer_size; SET @@global.aria_sort_buffer_size = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test index 1c6d805683f..7506e2567a0 100644 --- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/binlog_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test index 1074bb46069..384388fd631 100644 --- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/binlog_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test index fe8f89ccc16..5705467b8c4 100644 --- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test @@ -2,6 +2,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test index c4a2c95d42b..763fca05014 100644 --- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test @@ -2,6 +2,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/binlog_stmt_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test index 84a90d42bec..55f9f3fe010 100644 --- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test index 4727daf0b4b..8c8be473074 100644 --- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/bulk_insert_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test b/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test index 6e37a47c5b8..435a6c33341 100644 --- a/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test +++ b/mysql-test/suite/sys_vars/t/debug_crc_break_basic.test @@ -37,7 +37,10 @@ set global debug_crc_break="foo"; # set global debug_crc_break=0; select @@global.debug_crc_break; +--disable_warnings set global debug_crc_break=cast(-1 as unsigned int); +--enable_warnings +--replace_result 4294967295 18446744073709551615 select @@global.debug_crc_break; SET @@global.debug_crc_break = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test index 7cbce057bec..750202df0f3 100644 --- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test +++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/delayed_insert_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test index fbc31e937fe..960f00e4bcf 100644 --- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test +++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/delayed_insert_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test index 1e67d426f10..8c0027b2e3e 100644 --- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/delayed_queue_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test index 44d5839759c..c58da380fe4 100644 --- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/delayed_queue_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test index f6b35b89644..7886b1307ee 100644 --- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/join_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test index 5632471235f..65327e7afea 100644 --- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/join_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test index 8a234d9d300..1f10d9a3297 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test +++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/key_cache_age_threshold_basic.inc diff --git a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test index 32f98cba941..a3d27a7eae9 100644 --- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test +++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/key_cache_age_threshold_basic.inc diff --git a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test index a63cbed2aa3..c3ebd043b30 100644 --- a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test +++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/log_warnings_basic.inc diff --git a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test index 5a8ad5482a5..15781e7a912 100644 --- a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test +++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/log_warnings_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test index 62c7ec71568..23aeb1eb8b5 100644 --- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test +++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/max_connect_errors_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test index f27135d53c7..a206cdb580f 100644 --- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test +++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/max_connect_errors_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test index 4b9c7cf3b8e..5e4bcd9490d 100644 --- a/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test +++ b/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test @@ -111,28 +111,38 @@ SET @@global.max_heap_table_size = 1024; SELECT @@global.max_heap_table_size; SET @@global.max_heap_table_size = 16383; SELECT @@global.max_heap_table_size; +--disable_warnings SET @@global.max_heap_table_size = 4294967296; +--enable_warnings +--replace_result 4294966272 4294967296 SELECT @@global.max_heap_table_size; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.max_heap_table_size = 65530.34; +--replace_result 4294966272 4294967296 SELECT @@global.max_heap_table_size; --Error ER_WRONG_TYPE_FOR_VAR SET @@global.max_heap_table_size = test; +--replace_result 4294966272 4294967296 SELECT @@global.max_heap_table_size; SET @@session.max_heap_table_size = -1; SELECT @@session.max_heap_table_size; SET @@session.max_heap_table_size = 16383; SELECT @@session.max_heap_table_size; +--disable_warnings SET @@session.max_heap_table_size = 4294967296; +--enable_warnings +--replace_result 4294966272 4294967296 SELECT @@session.max_heap_table_size; --Error ER_WRONG_TYPE_FOR_VAR SET @@session.max_heap_table_size = 65530.34; SET @@session.max_heap_table_size = 10737418241; +--replace_result 4294966272 10737418240 SELECT @@session.max_heap_table_size; --Error ER_WRONG_TYPE_FOR_VAR SET @@session.max_heap_table_size = test; +--replace_result 4294966272 10737418240 SELECT @@session.max_heap_table_size; diff --git a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test index 84d76c7cb43..fef100cd432 100644 --- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test +++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/max_seeks_for_key_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test index 63c0c1d6a6b..3f50a068023 100644 --- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test +++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/max_seeks_for_key_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test index 95ce399e68e..10446926f3d 100644 --- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test +++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/max_tmp_tables_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test index 573e5a75230..dfc7d76d30e 100644 --- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test +++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/max_tmp_tables_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test index b4953208976..faaf8666bad 100644 --- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test +++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/max_write_lock_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test index b0c5dabac07..4ecd26bd505 100644 --- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test +++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/max_write_lock_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test index de53be3cb7c..67ff9594f30 100644 --- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test +++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/min_examined_row_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test index 449b5d5525e..29a168de906 100644 --- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test +++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/min_examined_row_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test index f9db6632d33..e4c6da9b25a 100644 --- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test +++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/multi_range_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test index 12ad7588bbd..8f446633626 100644 --- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test +++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/multi_range_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test index 6c0ff16bc6f..4511759fa69 100644 --- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test index 108cc2e2350..8ae0c086960 100644 --- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/myisam_max_sort_file_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test index f395ffe8ee0..12adb8aac07 100644 --- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test +++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/myisam_repair_threads_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test index 21ed5fd9c5f..0bdf31b590b 100644 --- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test +++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/myisam_repair_threads_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test index 9c4116758f7..5f5c2d1ad21 100644 --- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test index 70f8a33ed4d..e416e8bc486 100644 --- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/myisam_sort_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test index 56f0e56f100..5256529b55c 100644 --- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test +++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/net_retry_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test index cb1fe8beebb..b7b0fafb2c9 100644 --- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test +++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/net_retry_count_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test index 471b48c3059..d86ae690990 100644 --- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/query_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test index 64517899171..05267dac320 100644 --- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/query_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test index 0416fc46349..09ee78519b0 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test +++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/query_cache_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test index 0d134449bf9..2a64ee01da8 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test +++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/query_cache_limit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test index 1288157d102..90601919cef 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test +++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test index e941b55ab52..37df6cae4d4 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test +++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/query_cache_min_res_unit_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test index 17fd1bb41ab..452ed43b1ca 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/query_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test index ba0cddc5a3a..2ba81b66a2f 100644 --- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/query_cache_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test index 14cdc82f7c4..2921bde1d23 100644 --- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/range_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test index a4125b14fd0..3a638009c39 100644 --- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/range_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test b/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test index 1c88bdd7180..c7c734b7d24 100644 --- a/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test +++ b/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test @@ -36,6 +36,7 @@ set global rowid_merge_buff_size="foo"; set global rowid_merge_buff_size=0; select @@global.rowid_merge_buff_size; set session rowid_merge_buff_size=cast(-1 as unsigned int); +--replace_result 2147483647 9223372036854775807 4294967295 9223372036854775807 select @@session.rowid_merge_buff_size; SET @@global.rowid_merge_buff_size = @start_global_value; diff --git a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test index c28282dd38b..d0929039360 100644 --- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test +++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/rpl_recovery_rank_basic.inc diff --git a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test index 51895efa65e..1f6de849999 100644 --- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test +++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/rpl_recovery_rank_basic.inc diff --git a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test index 8f3147ddab4..9cdde198c3d 100644 --- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test +++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/slave_transaction_retries_basic.inc diff --git a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test index dfd52507f61..4284bc44bea 100644 --- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test +++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/slave_transaction_retries_basic.inc diff --git a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test index d63cc997f5b..86db7358473 100644 --- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/sort_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test index 4c7a16bd014..8336932fdcc 100644 --- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/sort_buffer_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test index b9fbf429220..db7181a7715 100644 --- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test index fb68245ee62..54bfa0fd0dc 100644 --- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test index 23ea53334ff..418d223bb47 100644 --- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test +++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test @@ -4,6 +4,6 @@ # Wrapper for 32 bit machines # ################################################################################ ---source include/have_32bit.inc +--source include/have_32bit_ulong.inc --source suite/sys_vars/inc/transaction_prealloc_size_basic.inc diff --git a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test index 79a18585e80..8f218cea1e0 100644 --- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test +++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test @@ -4,6 +4,6 @@ # Wrapper for 64 bit machines # ################################################################################ ---source include/have_64bit.inc +--source include/have_64bit_ulong.inc --source suite/sys_vars/inc/transaction_prealloc_size_basic.inc diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9da2393a0ad..8ecf15b7ad7 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1152,6 +1152,11 @@ static Sys_var_ulong Sys_metadata_locks_cache_size( VALID_RANGE(1, 1024*1024), DEFAULT(MDL_LOCKS_CACHE_SIZE_DEFAULT), BLOCK_SIZE(1)); +/* + "pseudo_thread_id" variable used in the test suite to detect 32/64bit + systems. If you change it to something else then ulong then fix the tests + in mysql-test/include/have_32bit.inc and have_64bit.inc. +*/ static Sys_var_ulong Sys_pseudo_thread_id( "pseudo_thread_id", "This variable is for internal server use", diff --git a/win/build-vs10.bat b/win/build-vs10.bat deleted file mode 100644 index b67ac7e9753..00000000000 --- a/win/build-vs10.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off - -REM Copyright (C) 2010 Monty Program AB -REM -REM This program is free software; you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation; version 2 of the License. -REM -REM This program is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -cmake -G "Visual Studio 10" - diff --git a/win/build-vs10_x64.bat b/win/build-vs10_x64.bat deleted file mode 100644 index f84e826ac65..00000000000 --- a/win/build-vs10_x64.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off - -REM Copyright (C) 2010 Monty Program AB -REM -REM This program is free software; you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation; version 2 of the License. -REM -REM This program is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program; if not, write to the Free Software -REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -cmake -G "Visual Studio 10 Win64" - diff --git a/win/build_maria_release.bat b/win/build_maria_release.bat deleted file mode 100644 index c5b1bb915c2..00000000000 --- a/win/build_maria_release.bat +++ /dev/null @@ -1,47 +0,0 @@ -set build_64_bit=
-set build_msi=
-set generator=
-set scriptdir=%~dp0
-
-:: Process all the arguments from the command line
-::
-:process_arguments
- if "%~1"=="" goto :do_work
- if "%~1"=="-h" goto :help
- if "%~1"=="-msi" set build_msi=1
- if "%~1"=="-G" set generator=-G "%~2"
- shift
- goto :process_arguments
-
-:help
- echo "build_maria_release [-h] [-msi] [-G <Generator>]"
-
-:die
- echo error occured.
- popd
- exit /b 1
-
-:do_work
-:: We're doing out-of-source build to ensure nobody has broken it:)
-
- pushd %scriptdir%
- cd ..
- rd /s /q xxx
- mkdir xxx
- cd xxx
-
- cmake .. -DWITH_EMBEDDED_SERVER=1 %generator%
- if %ERRORLEVEL% NEQ 0 goto :die
- cmake --build . --config Debug
- if %ERRORLEVEL% NEQ 0 goto :die
- cmake --build . --config RelWithDebInfo --target package
- if %ERRORLEVEL% NEQ 0 goto :die
-
-
- if "%build_msi%"=="1" (
- cmake --build . --config RelWithDebInfo --target win\packaging\msi
- if %ERRORLEVEL% NEQ 0 goto :die
- )
- xcopy /y *.zip ..
- xcopy /y *.msi ..
- popd
\ No newline at end of file diff --git a/win/configure-mariadb.bat b/win/configure-mariadb.bat deleted file mode 100644 index dc5b59819a3..00000000000 --- a/win/configure-mariadb.bat +++ /dev/null @@ -1,9 +0,0 @@ -cscript win\configure.js ^ - WITH_EXAMPLE_STORAGE_ENGINE ^ - WITH_FEDERATEDX_STORAGE_ENGINE ^ - WITH_MERGE_STORAGE_ENGINE ^ - WITH_PARTITION_STORAGE_ENGINE ^ - WITH_ARIA_STORAGE_ENGINE ^ - WITH_PBXT_STORAGE_ENGINE ^ - WITH_XTRADB_STORAGE_ENGINE ^ - WITH_FEEDBACK_STORAGE_ENGINE diff --git a/win/configure-mariadb.sh b/win/configure-mariadb.sh deleted file mode 100644 index 67bfe293639..00000000000 --- a/win/configure-mariadb.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# -# This script is the "standard" way to configure MariaDB on Windows. To be -# used by buildbot slaves and release build script. -# - -set -e - -cscript win/configure.js \ - WITH_ARCHIVE_STORAGE_ENGINE \ - WITH_BLACKHOLE_STORAGE_ENGINE \ - WITH_CSV_STORAGE_ENGINE \ - WITH_EXAMPLE_STORAGE_ENGINE \ - WITH_FEDERATEDX_STORAGE_ENGINE \ - WITH_MERGE_STORAGE_ENGINE \ - WITH_PARTITION_STORAGE_ENGINE \ - WITH_ARIA_STORAGE_ENGINE \ - WITH_PBXT_STORAGE_ENGINE \ - WITH_XTRADB_STORAGE_ENGINE \ - WITH_FEEDBACK_STORAGE_ENGINE \ - WITH_EMBEDDED_SERVER diff --git a/win/make_mariadb_win_dist b/win/make_mariadb_win_dist deleted file mode 100644 index f6d961ea866..00000000000 --- a/win/make_mariadb_win_dist +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -# -# This is a script that one needs to run in the source tarball to build -# a MariaDB release for Windows -# - -set -e - -usage() -{ -cat <<EOF -Usage: $0 [-h] [-64] [-nobuild] - -h, --help Show this help message. - -64 Build a 64 bit distribution. - -nobuild Don't run cmake and devenv, only do the packaging. - -The default is to the builds and create 32 bit packages. -EOF -} - - -if test -f win/build_maria_release.bat -then - cmd /c win\\build_maria_release.bat "$@" - exit $? -fi - -# The default settings -CMAKE_GENERATOR="Visual Studio 9 2008" -ARCH="win32" -RUNBUILD="yes" - -parse_options() -{ - while test $# -gt 0 - do - case "$1" in - -64) - CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ARCH="win64" - ;; - -nobuild) - RUNBUILD="no" - ;; - -h | --help) - usage - exit 0;; - *) - echo "Unknown option '$1'" - usage - exit 1;; - esac - shift - done -} - -######################################################################## - -if test ! -f sql/mysqld.cc -then - echo "You must run this script from the MySQL top-level directory" - exit 1 -fi - -if [ ! -d win/data ] ; then - echo This doesnt seem to be source tarball. - echo This script should be run from the top directory of the source tarball - echo that was produced by 'make dist' - exit 1; -fi - -parse_options "$@" - -set -x - -if [ "$RUNBUILD" == "yes" ]; then - sh win/configure-mariadb.sh - - cmake -G "$CMAKE_GENERATOR" - - devenv.com MySQL.sln /build RelWithDebInfo - devenv.com MySQL.sln /build Debug -fi - -VER=`cat configure.in | - perl -e 'while (<>) { if (/^AC_INIT\(\[[a-zA-Z ]*\], *\[([0-9a-zA-Z\.-]+)\]/) { print "$1\n"; exit(0)} } ; exit 1'` - -echo Version string: $VER. - -# Remove '-mariaDB' from version number -VER_NO_MARIA=${VER/-MariaDB/} - -# We want the final zip to be named like this: -# mariadb-noinstall-5.1.38-win32.zip -ZIPNAME=mariadb-noinstall-$VER_NO_MARIA-$ARCH -ZIPFILE=$ZIPNAME.zip - -# The top directory inside the zip should be called like this: -# mariadb-5.1-38-$ARCH -ZIPCONTENT=mariadb-$VER_NO_MARIA-$ARCH - -# This will make $ZIPCONTENT.zip -sh -x scripts/make_win_bin_dist $ZIPCONTENT - -mv $ZIPCONTENT.zip $ZIPFILE - -#rm -rf unpack -#mkdir unpack - -#cd unpack -#wget -O base.list.gz \ -#http://askmonty.org/wiki/images/5/57/Mariadb-5.1-pre-beta-file-list-r2.txt.gz -#gunzip base.list.gz -#unzip ../$ZIPFILE -#(cd $ZIPCONTENT; /bin/find . | sort ) > new.list - -#diff -u base.list new.list || true -#RES=$? - -#cd .. - -#rm -rf unpack - -ls -lah $ZIPFILE -echo "$ZIPFILE is the Windows noinstall binary zip" - -#if [ $RES ] ; then -# echo "Archive contents differ from the standard file list, check the diff output above" -#else -# echo "Archive contents match the standard list, OK" -#fi |