bk commit into 5.1 tree (gkodinov:1.2658) BUG#31524

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-25 17:56:44+02:00, gkodinov@stripped +4 -0
  Bug #31524: One table one row select on NDB cause optimizer to 
    require SQL_BIG_SELECTS=1
  
  There was a previous test that leaves a non-default (small) max_join_size.
  Fixed by re-setting the max_join_size to default when the test is over.

  mysql-test/extra/rpl_tests/rpl_row_charset.test@stripped, 2008-01-25 17:56:41+02:00,
gkodinov@stripped +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/suite/rpl/r/rpl_row_charset.result@stripped, 2008-01-25 17:56:41+02:00,
gkodinov@stripped +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/suite/rpl/r/rpl_row_charset_innodb.result@stripped, 2008-01-25 17:56:41+02:00,
gkodinov@stripped +1 -1
    Bug #31524: side effects of previous testsuites fixed

  mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result@stripped, 2008-01-25 17:56:41+02:00,
gkodinov@stripped +1 -1
    Bug #31524: side effects of previous testsuites fixed

diff -Nrup a/mysql-test/extra/rpl_tests/rpl_row_charset.test
b/mysql-test/extra/rpl_tests/rpl_row_charset.test
--- a/mysql-test/extra/rpl_tests/rpl_row_charset.test	2007-10-09 20:48:04 +03:00
+++ b/mysql-test/extra/rpl_tests/rpl_row_charset.test	2008-01-25 17:56:41 +02:00
@@ -141,6 +141,7 @@ error 1115;
 set character_set_client=9999999;
 error 1273;
 set collation_server=9999998;
+set max_join_size=default;
 
 # This one was contributed by Sergey Petrunia (BUG#3943)
 
@@ -151,7 +152,6 @@ SET CHARACTER_SET_CLIENT=koi8r,
  CHARACTER_SET_CONNECTION=cp1251, 
  CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 sync_slave_with_master;
 SET SQL_BIG_SELECTS=1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_charset.result
b/mysql-test/suite/rpl/r/rpl_row_charset.result
--- a/mysql-test/suite/rpl/r/rpl_row_charset.result	2007-10-09 20:48:37 +03:00
+++ b/mysql-test/suite/rpl/r/rpl_row_charset.result	2008-01-25 17:56:41 +02:00
@@ -173,6 +173,7 @@ set character_set_client=9999999;
 ERROR 42000: Unknown character set: '9999999'
 set collation_server=9999998;
 ERROR HY000: Unknown collation: '9999998'
+set max_join_size=default;
 select "--- --3943--" as "";
 
 --- --3943--
@@ -182,7 +183,6 @@ SET CHARACTER_SET_CLIENT=koi8r,
 CHARACTER_SET_CONNECTION=cp1251, 
 CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
b/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result	2007-10-09 20:50:55 +03:00
+++ b/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result	2008-01-25 17:56:41 +02:00
@@ -185,6 +185,7 @@ set character_set_client=9999999;
 ERROR 42000: Unknown character set: '9999999'
 set collation_server=9999998;
 ERROR HY000: Unknown collation: '9999998'
+set max_join_size=default;
 select "--- --3943--" as "";
 
 --- --3943--
@@ -194,7 +195,6 @@ SET CHARACTER_SET_CLIENT=koi8r,
 CHARACTER_SET_CONNECTION=cp1251, 
 CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result	2007-10-09 20:46:45 +03:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result	2008-01-25 17:56:41 +02:00
@@ -171,6 +171,7 @@ set character_set_client=9999999;
 ERROR 42000: Unknown character set: '9999999'
 set collation_server=9999998;
 ERROR HY000: Unknown collation: '9999998'
+set max_join_size=default;
 select "--- --3943--" as "";
 
 --- --3943--
@@ -180,7 +181,6 @@ SET CHARACTER_SET_CLIENT=koi8r,
 CHARACTER_SET_CONNECTION=cp1251, 
 CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3