diff --git a/mysql-test/include/have_32bit.inc b/mysql-test/include/have_32bit_ulong.inc similarity index 81% rename from mysql-test/include/have_32bit.inc rename to mysql-test/include/have_32bit_ulong.inc index cab45f03fdf..0323b8a9888 100644 --- a/mysql-test/include/have_32bit.inc +++ b/mysql-test/include/have_32bit_ulong.inc @@ -1,5 +1,5 @@ # Created by Horst Hunger 2008-04-15 -# see also have_64bit.inc +# see also have_64bit_ulong.inc --disable_query_log --disable_warnings @@ -11,6 +11,6 @@ eval SET @@pseudo_thread_id = $save; --enable_query_log if (!$mach32) { - skip Need a 32 bit machine/binary; + skip Need a 32 bit unsigned long; } diff --git a/mysql-test/include/have_64bit.inc b/mysql-test/include/have_64bit_ulong.inc similarity index 80% rename from mysql-test/include/have_64bit.inc rename to mysql-test/include/have_64bit_ulong.inc index 39a1d6db34d..529ab225e4f 100644 --- a/mysql-test/include/have_64bit.inc +++ b/mysql-test/include/have_64bit_ulong.inc @@ -1,5 +1,5 @@ # Created by Horst Hunger 2008-04-15 -# see also have_32bit.inc +# see also have_32bit_ulong.inc --disable_query_log let $save = `SELECT @@pseudo_thread_id`; @@ -9,6 +9,6 @@ eval SET @@pseudo_thread_id = $save; --enable_query_log if (!$mach64) { - skip Need a 64 binary ; + skip Need a 64 unsigned long ; } 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/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_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 65aa9de65be..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,7 +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 +--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