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

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

mysql-test/suite/rpl/r/rpl_row_charset.result

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

mysql-test/suite/rpl/r/rpl_row_charset_innodb.result

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

mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result

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