mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-04-12 18:25:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions1

fix for 64bit windows

Browse source 
fix misleading test name
This commit is contained in:
unknown 2012-01-11 10:26:35 +02:00
parent e022fd8bf8
commit db7acaa475
59 changed files with 61 additions and 61 deletions
mysql-test
include
have_32bit_ulong.inchave_64bit_ulong.inc
suite/sys_vars/t
binlog_cache_size_basic_32.testbinlog_cache_size_basic_64.testbinlog_stmt_cache_size_basic_32.testbinlog_stmt_cache_size_basic_64.testbulk_insert_buffer_size_basic_32.testbulk_insert_buffer_size_basic_64.testdelayed_insert_limit_basic_32.testdelayed_insert_limit_basic_64.testdelayed_queue_size_basic_32.testdelayed_queue_size_basic_64.testjoin_buffer_size_basic_32.testjoin_buffer_size_basic_64.testkey_cache_age_threshold_basic_32.testkey_cache_age_threshold_basic_64.testlog_warnings_basic_32.testlog_warnings_basic_64.testmax_connect_errors_basic_32.testmax_connect_errors_basic_64.testmax_seeks_for_key_basic_32.testmax_seeks_for_key_basic_64.testmax_tmp_tables_basic_32.testmax_tmp_tables_basic_64.testmax_write_lock_count_basic_32.testmax_write_lock_count_basic_64.testmin_examined_row_limit_basic_32.testmin_examined_row_limit_basic_64.testmulti_range_count_basic_32.testmulti_range_count_basic_64.testmyisam_max_sort_file_size_basic_32.testmyisam_max_sort_file_size_basic_64.testmyisam_repair_threads_basic_32.testmyisam_repair_threads_basic_64.testmyisam_sort_buffer_size_basic_32.testmyisam_sort_buffer_size_basic_64.testnet_retry_count_basic_32.testnet_retry_count_basic_64.testquery_alloc_block_size_basic_32.testquery_alloc_block_size_basic_64.testquery_cache_limit_basic_32.testquery_cache_limit_basic_64.testquery_cache_min_res_unit_basic_32.testquery_cache_min_res_unit_basic_64.testquery_cache_size_basic_32.testquery_cache_size_basic_64.testrange_alloc_block_size_basic_32.testrange_alloc_block_size_basic_64.testrowid_merge_buff_size_basic.testrpl_recovery_rank_basic_32.testrpl_recovery_rank_basic_64.testslave_transaction_retries_basic_32.testslave_transaction_retries_basic_64.testsort_buffer_size_basic_32.testsort_buffer_size_basic_64.testtransaction_alloc_block_size_basic_32.testtransaction_alloc_block_size_basic_64.testtransaction_prealloc_size_basic_32.testtransaction_prealloc_size_basic_64.test

4
mysql-test/include/have_32bit.inc → mysql-test/include/have_32bit_ulong.inc
View file

@ -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;
}

4
mysql-test/include/have_64bit.inc → mysql-test/include/have_64bit_ulong.inc
View file

@ -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 ;
}

2
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test
View file

@ -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;

2
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
View file

@ -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

2
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
View file

@ -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