bzr push into mysql-trunk branch (ashish.y.agarwal:3834 to 3835) Bug#11754145

[Ashish Agarwal]

 3835 Ashish Agarwal	2012-02-03 [merge]
      BUG#11754145: Merge from mysql-5.5 to mysql-trunk

    modified:
      mysql-test/include/have_32bit.inc
      mysql-test/include/have_64bit.inc
 3834 Jorgen Loland	2012-02-03
      Assertion that selectivity does not increase by adding another 
      scan to a ROR intersect triggers. Temporarily remove it.

    modified:
      sql/opt_range.cc
=== 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	2012-02-03 13:49:32 +0000
@@ -3,10 +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.myisam_sort_buffer_size`;
+SET @@global.myisam_sort_buffer_size = 4294967296;
+let $mach32 = `SELECT @@global.myisam_sort_buffer_size <= 4294967295`;
+eval SET @@global.myisam_sort_buffer_size = $save;
 --enable_warnings
 --enable_query_log
 if (!$mach32)

=== 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	2012-02-03 13:49:32 +0000
@@ -2,10 +2,10 @@
 # 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 @@session.myisam_sort_buffer_size`;
+SET @@session.myisam_sort_buffer_size = 4294967296;
+let $mach64 = `SELECT @@session.myisam_sort_buffer_size > 4294967295`;
+eval SET @@session.myisam_sort_buffer_size = $save;
 --enable_query_log
 if (!$mach64)
 {

No bundle (reason: useless for push emails).