[Commits] Rev 3213: fix for 64bit windows in file:///home/bell/maria/bzr/work-maria-5.5-sysvar/

sanja at montyprogram.com sanja at montyprogram.com
Wed Jan 11 10:26:41 EET 2012


At file:///home/bell/maria/bzr/work-maria-5.5-sysvar/

------------------------------------------------------------
revno: 3213
revision-id: sanja at montyprogram.com-20120111082635-2jwkukatjz5qcwy4
parent: wlad at montyprogram.com-20120110001136-j4to4qn5jyd2i8p4
committer: sanja at montyprogram.com
branch nick: work-maria-5.5-sysvar
timestamp: Wed 2012-01-11 10:26:35 +0200
message:
  fix for 64bit windows
  fix misleading test name
-------------- next part --------------
=== renamed file 'mysql-test/include/have_32bit.inc' => 'mysql-test/include/have_32bit_ulong.inc'
--- a/mysql-test/include/have_32bit.inc	2012-01-09 13:02:02 +0000
+++ b/mysql-test/include/have_32bit_ulong.inc	2012-01-11 08:26:35 +0000
@@ -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;
 }
 

=== renamed file 'mysql-test/include/have_64bit.inc' => 'mysql-test/include/have_64bit_ulong.inc'
--- a/mysql-test/include/have_64bit.inc	2012-01-09 13:02:02 +0000
+++ b/mysql-test/include/have_64bit_ulong.inc	2012-01-11 08:26:35 +0000
@@ -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 ;
 }
 

=== modified file 'mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test	2010-11-05 17:42:37 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test	2010-11-05 17:42:37 +0000
+++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_insert_limit_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/delayed_queue_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/key_cache_age_threshold_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/log_warnings_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/log_warnings_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_seeks_for_key_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_tmp_tables_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/max_write_lock_count_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/min_examined_row_limit_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/multi_range_count_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_max_sort_file_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_repair_threads_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/net_retry_count_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_limit_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_min_res_unit_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/query_cache_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/range_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test	2012-01-09 13:02:02 +0000
+++ b/mysql-test/suite/sys_vars/t/rowid_merge_buff_size_basic.test	2012-01-11 08:26:35 +0000
@@ -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;

=== modified file 'mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/rpl_recovery_rank_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/slave_transaction_retries_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/sort_buffer_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test'
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	2012-01-11 08:26:35 +0000
@@ -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
 

=== modified file 'mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test'
--- a/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	2012-01-11 08:26:35 +0000
@@ -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
 



More information about the commits mailing list