bzr push into mysql-trunk branch (sneha.modi:3678 to 3679) Bug#11748572

[Sneha Modi]

 3679 Sneha Modi	2011-12-21
      Bug#11748572:ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC
      
      There was some error distinguishing between a 32-bit and a 64-bit machine.
      System variable version_compile_machine is used for this comparison and the
      behaviour is being tested.

    modified:
      mysql-test/include/have_32bit.inc
      mysql-test/include/have_64bit.inc
 3678 Sneha Modi	2011-12-20
      Bug#11754150:  A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      current_time() truncates the time value when stored as int variable in mysql-5.5 as cmpared to mysql-trunk.
      Using unix_timestamp() instead of current_time().

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
=== modified file 'mysql-test/include/have_32bit.inc'
--- a/mysql-test/include/have_32bit.inc	2009-01-08 18:13:57 +0000
+++ b/mysql-test/include/have_32bit.inc	2011-12-21 13:11:05 +0000
@@ -3,13 +3,10 @@
 
 --disable_query_log
 --disable_warnings
-let $save = `SELECT @@global.sort_buffer_size`;
-SET @@global.sort_buffer_size = 4294967296;
-let $mach32 = `SELECT @@global.sort_buffer_size <= 4294967295`;
-eval SET @@global.sort_buffer_size = $save;
+let $save = `SELECT @@global.version_compile_machine`;
 --enable_warnings
 --enable_query_log
-if (!$mach32)
+if ($save == "x86_64")
 {
   skip Need a 32 bit machine/binary;
 }

=== modified file 'mysql-test/include/have_64bit.inc'
--- a/mysql-test/include/have_64bit.inc	2009-01-08 18:13:57 +0000
+++ b/mysql-test/include/have_64bit.inc	2011-12-21 13:11:05 +0000
@@ -2,12 +2,9 @@
 # see also have_32bit.inc
 
 --disable_query_log
-let $save = `SELECT @@session.sort_buffer_size`;
-SET @@session.sort_buffer_size = 4294967296;
-let $mach64 = `SELECT @@session.sort_buffer_size > 4294967295`;
-eval SET @@session.sort_buffer_size = $save;
+let $save = `SELECT @@global.version_compile_machine`;
 --enable_query_log
-if (!$mach64)
+if ($save != "x86_64")
 {
   skip Need a 64 binary ;
 }

No bundle (reason: useless for push emails).