merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.

mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
2025-07-29 05:21:33 +03:00 · 2008-11-12 19:51:47 +02:00
parent 162e550fcf 1d521f6c20
commit ca2d184695
233 changed files with 18121 additions and 6228 deletions
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@ -947,4 +947,44 @@ ALTER TABLE t1 CHANGE d c varchar(10);
 --disable_info
 DROP TABLE t1;

+#
+# Bug#39372 "Smart" ALTER TABLE not so smart after all.
+#
+create table t1(f1 int not null, f2 int not null, key  (f1), key (f2));
+let $count= 50;
+--disable_query_log
+while ($count)
+{
+  EVAL insert into t1 values (1,1),(1,1),(1,1),(1,1),(1,1);
+  EVAL insert into t1 values (2,2),(2,2),(2,2),(2,2),(2,2);
+  dec $count ;
+}
+--enable_query_log
+
+select index_length into @unpaked_keys_size from
+information_schema.tables where table_name='t1';
+alter table t1 pack_keys=1;
+select index_length into @paked_keys_size from
+information_schema.tables where table_name='t1';
+select (@unpaked_keys_size > @paked_keys_size);
+
+select max_data_length into @orig_max_data_length from
+information_schema.tables where table_name='t1';
+alter table t1 max_rows=100;
+select max_data_length into @changed_max_data_length from
+information_schema.tables where table_name='t1';
+select (@orig_max_data_length > @changed_max_data_length);
+
+drop table t1;
+
+#
+# Bug #23113: Different behavior on altering ENUM fields between 5.0 and 5.1
+#
+CREATE TABLE t1(a INT AUTO_INCREMENT PRIMARY KEY, 
+  b ENUM('a', 'b', 'c') NOT NULL);
+INSERT INTO t1 (b) VALUES ('a'), ('c'), ('b'), ('b'), ('a');
+ALTER TABLE t1 MODIFY b ENUM('a', 'z', 'b', 'c') NOT NULL;
+SELECT * FROM t1;
+DROP TABLE t1;
+
 --echo End of 5.1 tests
--- a/mysql-test/t/binlog_format_basic.test
+++ b/mysql-test/t/binlog_format_basic.test
@ -20,6 +20,13 @@
 #                                                                             #
 ###############################################################################

+###################################################################
+# BUG#39812: Make statement replication default for 5.1 (to match 5.0)
+# We just verify that the default binlog_format is STATEMENT in 5.1.
+# In 6.0, it should be MIXED.
+###################################################################
+SELECT @@GLOBAL.binlog_format;
+
 --echo '#---------------------BS_STVARS_002_01----------------------#'
 ####################################################################
 #   Displaying default value                                       #
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@ -11,7 +11,6 @@
 ##############################################################################
 federated_transactions   : Bug#29523 Transactions do not work
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
-thread_cache_size_func : Bug#36733 main.thread_cache_size_func fails randomly
 log_tables.test                       : Bug #37798: main.log_tables fails randomly on powermacg5 and windows
 wait_timeout_func                     : BUG#36873 2008-07-06 sven wait_timeout_func.test fails randomly
 delayed_insert_limit_func             : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
@ -25,4 +24,3 @@ sql_low_priority_updates_func         : BUG#37962 2008-07-08 sven *_func tests c
 timestamp_func                        : BUG#37962 2008-07-08 sven *_func tests containing sleeps/race conditions
 log_output_func                       : BUG#37766 2008-07-10 sven main.log_output_func randomly fails in pushbuild
 slow_query_log_func.test              : Bug #37962: *_func tests containing sleeps/race conditions
-events-bugs.test                      : Bug #39848, Bug #39863, Bug #39569, Bug #37774
--- a/mysql-test/t/events_bugs.test
+++ b/mysql-test/t/events_bugs.test
@ -1,3 +1,42 @@
+#### t/events_bugs.test
+#
+# Last change:
+# 2008-10-16 mleich
+#     - Fix for
+#       Bug#39848 events_bugs fails sporadically on pushbuild
+#              (missing rows in table event_log)
+#       Bug#39863 events_bugs fails sporadically on pushbuild (extra processes
+#                 in I_S.PROCESSLIST)
+#       Bug#39978 main.events_bugs does not clean up
+#       Bug#39569 events_bugs fails sporadically on pushbuild (should have
+#                 failed with errno 1539)
+#     - Minor improvements of formatting
+#
+#
+# Outcome of some experiments (mleich):
+# 1. SET GLOBAL event_scheduler = 'ON';
+#    Immediate observation of the processlist.
+#    Effects:
+#    1. There is no guarantee to find immediate the user 'event_scheduler'
+#       within information_schema.processlist.
+#    2. Some states of the user 'event_scheduler' found in PROCESSLIST:
+#       USER            HOST       DB   COMMAND TIME STATE                  INFO
+#       event_scheduler localhost  NULL Daemon  0    Waiting on empty queue NULL
+#       event_scheduler localhost  NULL Daemon  0    Initialized            NULL
+# 2. SET GLOBAL event_scheduler = 'OFF';
+#    Immediate observation of the processlist.
+#    Effects:
+#    1. I never found the user 'event_scheduler' within the processlist.
+#    2. Events just during execution could be found within the processlist
+#       = It does not look like "SET GLOBAL event_scheduler = 'OFF'" stops them.
+# 3. An event gets executed
+#    USER evtest1     (Definer of event)
+#    DB   events_test (DB during time of event creation)
+#    COMMAND Connect
+#    STATE   NULL
+#    INFO    SET @evname = 'ev_sched_1823' (Part of the event code)
+#
+
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc

@ -105,14 +144,39 @@ begin
 end|
 delimiter ;|

+# The default session has the user lock.
+# We wait till one event runs and hangs when trying to get the user lock.
 let $wait_condition=
-  select count(*) = 1 from information_schema.processlist
+  select count(*) > 0 from information_schema.processlist
  where info = 'select get_lock(\'test_bug16407\', 60)';
 --source include/wait_condition.inc

 --echo "Now if everything is fine the event has compiled and is locked"
-select /*1*/ user, host, db, info from information_schema.processlist where command!='Daemon' and (info is null or info not like '%processlist%') order by info;
+# Expect to see one session in events_test waiting for the user lock.
+select /*1*/ user, host, db, info from information_schema.processlist
+where info = 'select get_lock(\'test_bug16407\', 60)';
 select release_lock('test_bug16407');
+# Try to avoid
+#    Bug#39863 events_bugs fails sporadically on pushbuild (extra processes in I_S.PROCESSLIST)
+# which is most probably caused by
+#    Bug#32782 User lock hash fails to find lock
+#    "various issues related to missing or incorrect return results
+#     from release_lock()."
+# Therefore we check here if the event executing session disappeared or
+# we waited >= 5 seconds for this to happen.
+let $wait_timeout= 5;
+let $wait_condition=
+  select count(*) = 0 from information_schema.processlist
+  where info = 'select get_lock(\'test_bug16407\', 60)';
+--source include/wait_condition.inc
+if (!`$wait_condition`)
+{
+   --echo ERROR: There must be no session with info = 'select get_lock('test_bug16407', 60) within the processlist.
+   --echo        We probably hit Bug#32782 User lock hash fails to find lock
+   eval select * from information_schema.processlist;
+   --echo Abort
+   exit;
+}

 set global event_scheduler= off;

@ -164,17 +228,27 @@ let $wait_condition=
  where info = 'select get_lock(\'ee_16407_2\', 60)';
 --source include/wait_condition.inc

-select /*2*/ user, host, db, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
+select /*2*/ user, host, db, info from information_schema.processlist
+where info = 'select get_lock(\'ee_16407_2\', 60)';
 select release_lock('ee_16407_2');

+# Try to avoid
+#    Bug#39863 events_bugs fails sporadically on pushbuild (extra processes in I_S.PROCESSLIST)
+# which is most probably caused by
+#    Bug#32782 User lock hash fails to find lock
+#    "various issues related to missing or incorrect return results
+#     from release_lock()."
+# Therefore we check here if the event executing sessions disappeared or
+# we waited >= 5 seconds for this to happen.
+let $wait_timeout= 5;
 let $wait_condition=
-  select count(*) = 1 and user = 'event_scheduler' and info is null
+  select count(*) = 0
  from information_schema.processlist
-  where (command!='Daemon' || user='event_scheduler')
-  and (info is null or info not like '%processlist%');
+  where info = 'select get_lock(\'ee_16407_2\', 60)';
 --source include/wait_condition.inc

-select /*3*/ user, host, db, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
+select /*3*/ user, host, db, info from information_schema.processlist
+where info = 'select get_lock(\'ee_16407_2\', 60)';
 set global event_scheduler= off;
 select * from events_smode_test order by ev_name, a;
 --echo "OK, last check before we drop them"
@ -216,7 +290,9 @@ let $wait_condition=
 --source include/wait_condition.inc

 --echo "Should have 2 locked processes"
-select /*4*/ user, host, db, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
+select /*4*/ user, host, db, info from information_schema.processlist
+where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%')
+order by info;
 select release_lock('ee_16407_5');

 let $wait_condition=
@ -227,7 +303,9 @@ let $wait_condition=
 --source include/wait_condition.inc

 --echo "Should have 0 processes locked"
-select /*5*/ user, host, db, info from information_schema.processlist where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%') order by info;
+select /*5*/ user, host, db, info from information_schema.processlist
+where (command!='Daemon' || user='event_scheduler') and (info is null or info not like '%processlist%')
+order by info;
 select * from events_smode_test order by ev_name, a;
 --echo "And here we check one more time before we drop the events"
 select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
@ -239,7 +317,7 @@ set global event_scheduler= off;
 drop table events_smode_test;
 set sql_mode=@old_sql_mode;
 #
-# End  - 16407: Events: Changes in sql_mode won't be taken into account  
+# End  - 16407: Events: Changes in sql_mode won't be taken into account
 #

 #
@ -401,39 +479,39 @@ CREATE USER mysqltest_u1@localhost;
 GRANT EVENT ON events_test.* TO mysqltest_u1@localhost;

 CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 CREATE DEFINER=CURRENT_USER EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 ALTER DEFINER=mysqltest_u1@localhost EVENT e1 ON SCHEDULE EVERY 1 HOUR;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 CREATE DEFINER=CURRENT_USER() EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 CREATE DEFINER=mysqltest_u1@localhost EVENT e1 ON SCHEDULE EVERY 1 DAY DO
  SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 connect (conn1, localhost, mysqltest_u1, , events_test);

 CREATE EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 CREATE DEFINER=CURRENT_USER EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 --error ER_SPECIFIC_ACCESS_DENIED_ERROR
 ALTER DEFINER=root@localhost EVENT e1 ON SCHEDULE EVERY 1 HOUR;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 CREATE DEFINER=CURRENT_USER() EVENT e1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS; 
+SELECT event_name, definer FROM INFORMATION_SCHEMA.EVENTS;
 DROP EVENT e1;

 --error ER_SPECIFIC_ACCESS_DENIED_ERROR
@ -664,21 +742,18 @@ CREATE EVENT new_event ON SCHEDULE AT NOW() ENDS NOW() DO SELECT 1;
 CREATE EVENT new_event ON SCHEDULE AT NOW() STARTS NOW() ENDS NOW() DO SELECT 1;

 #
-# START - BUG#28924 If I drop the user who is the definer of an active event then server cores
+# START - BUG#28924 If I drop the user who is the definer of an active event
+#                   then server cores
 #
 let $engine=MyISAM;
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 SET GLOBAL event_scheduler = ON;
-eval CREATE TABLE event_log (id int KEY AUTO_INCREMENT,
-                             ev_nm char(40), ev_cnt int,
-                             ev_tm timestamp) ENGINE=$engine; 
-SET @ev_base_date = 20281224180000;
--disable_warnings
+eval
+CREATE TABLE events_test.event_log
+(id int KEY AUTO_INCREMENT, ev_nm char(40), ev_cnt int, ev_tm timestamp)
+ENGINE=$engine;
 SET autocommit=0;
-#DROP DATABASE IF EXISTS ev_db_1;
-#CREATE DATABASE ev_db_1;
--enable_warnings
 CREATE USER evtest1@localhost;
 SET PASSWORD FOR evtest1@localhost = password('ev1');
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM evtest1@localhost;
@ -689,53 +764,70 @@ SHOW GRANTS FOR evtest1@localhost;
 --echo connection e1;
 --replace_result $MASTER_MYPORT MASTER_MYPORT $MASTER_MYSOCK MASTER_MYSOCK
 connect (e1,localhost,evtest1,ev1,events_test,$MASTER_MYPORT,$MASTER_MYSOCK);
-USE events_test;
-
 DELIMITER |;
 CREATE EVENT ev_sched_1823 ON SCHEDULE EVERY 2 SECOND
 DO BEGIN
-       SET AUTOCOMMIT = 0;
-       SET @evname = 'ev_sched_1823';
-       SET @cnt = 0;
-       SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
-       IF @cnt < 6 THEN
-         INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
-         COMMIT;
-       END IF;
-       SELECT COUNT(*) INTO @cnt FROM test.event_log WHERE ev_nm = @evname;
-       IF @cnt < 6 THEN
-         INSERT INTO test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
-         ROLLBACK;
-       END IF;
+   SET AUTOCOMMIT = 0;
+   SET @evname = 'ev_sched_1823';
+   SET @cnt = 0;
+   SELECT COUNT(*) INTO @cnt FROM events_test.event_log WHERE ev_nm = @evname;
+   IF @cnt < 6 THEN
+      INSERT INTO events_test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
+      COMMIT;
+   END IF;
+   SELECT COUNT(*) INTO @cnt FROM events_test.event_log WHERE ev_nm = @evname;
+   IF @cnt < 6 THEN
+      INSERT INTO events_test.event_log VALUES (NULL,@evname,@cnt+1,current_timestamp());
+      ROLLBACK;
+   END IF;
 END;|
 DELIMITER ;|
-
--sleep 6
+# 1. Show that the new created event is runnable and gets executed within a
+#    reasonable time like 4 seconds. Till ~ 2 seconds could pass on a heavy
+#    loaded testing box before something gets executed).
+#    Detection of execution is via the records inserted by the event.
+--echo Sleep till the first INSERT into events_test.event_log occured
+let $wait_timeout= 4;
+let $wait_condition=
+SELECT COUNT(*) > 0 FROM events_test.event_log;
+--source include/wait_condition.inc
+SELECT COUNT(*) > 0 AS "Expect 1" FROM events_test.event_log;
+#
 --echo connection default;
-DROP EVENT ev_sched_1823;
 connection default;
 DROP USER evtest1@localhost;
-
--sleep 6
-USE test;
--echo =====================================================================================
--sleep 5
-#--disable_result_log
-select id,ev_nm,ev_cnt from event_log order by id;
-#--enable_result_log
-DROP TABLE event_log;
-#DROP DATABASE ev_db_1;
+# 2. If we meet BUG#28924 again than a server crash happens within the next
+#    few seconds
+# 3. Check that the event is never executed again
+#    It could be that an event execution was running before the DROP USER
+#    and all implicite actions belonging to this are completed.
+#    Lets assume that ~ 4 seconds waiting are enough for the event
+#    scheduler to detect that
+--echo Sleep 4 seconds
+sleep 4;
+SELECT COUNT(*) INTO @row_cnt FROM events_test.event_log;
+#    Give the event mechanism ~ 4 seconds to do something wrong
+#    (execute the event of the dropped user -> inser rows).
+--echo Sleep 4 seconds
+sleep 4;
+SELECT COUNT(*) > @row_cnt AS "Expect 0" FROM events_test.event_log;
+#
+# Cleanup
+disconnect e1;
+DROP EVENT events_test.ev_sched_1823;
+DROP TABLE events_test.event_log;
 SET GLOBAL event_scheduler = OFF;

+
 #
 # Bug#28641 CREATE EVENT with '2038.01.18 03:00:00' let server crash.
 #
 SET GLOBAL event_scheduler= ON;
 DELIMITER |;
 CREATE EVENT bug28641 ON SCHEDULE AT '2038.01.18 03:00:00'
-            DO BEGIN
-		SELECT 1;
-               END;|
+DO BEGIN
+   SELECT 1;
+END;|

 DELIMITER ;|
 SET GLOBAL event_scheduler= OFF;
@ -868,7 +960,7 @@ SET GLOBAL EVENT_SCHEDULER = ON;

 --echo # Waiting for the event scheduler to execute and drop event e1...

-let $wait_timeout = 2;
+let $wait_timeout = 4;
 let $wait_condition =
  SELECT COUNT(*) = 0
  FROM INFORMATION_SCHEMA.EVENTS
@ -957,7 +1049,7 @@ select name from mysql.event where name = 'p' and sql_mode = @full_mode;
 drop event e1;

 ###########################################################################
-# 
+#
 # End of tests
 #
 # !!! KEEP this section AT THE END of this file !!!
@ -970,8 +1062,9 @@ let $wait_condition=
 --source include/wait_condition.inc

 DROP DATABASE events_test;
+# Restore the original state i.e to how it was when test started
+# (option with no argument in events_bugs-master.opt  turns the scheduler on).

-# Restore event_schedulre setting to how it was when test started
 SET GLOBAL event_scheduler= 'ON';

 # THIS MUST BE THE LAST LINE in this file.
--- a/mysql-test/t/explain.test
+++ b/mysql-test/t/explain.test
@ -94,4 +94,51 @@ EXPLAIN SELECT 1 FROM
 DROP TABLE t2;
 DROP TABLE t1;

+#
+# Bug #34773: query with explain extended and derived table / other table
+# crashes server
+#
+
+CREATE TABLE t1(a INT);
+CREATE TABLE t2(a INT);
+INSERT INTO t1 VALUES (1),(2);
+INSERT INTO t2 VALUES (1),(2);
+
+EXPLAIN EXTENDED SELECT 1
+ FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1;
+
+EXPLAIN EXTENDED SELECT 1
+ FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1;
+
+prepare s1 from 
+'EXPLAIN EXTENDED SELECT 1  
+ FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1';
+execute s1;
+
+prepare s1 from 
+'EXPLAIN EXTENDED SELECT 1  
+ FROM (SELECT COUNT(DISTINCT t1.a) FROM t1,t2 GROUP BY t1.a) AS s1';
+execute s1;
+execute s1;
+
+DROP TABLE t1,t2;
+
+--echo #
+--echo # Bug#37870: Usage of uninitialized value caused failed assertion.
+--echo #
+create table t1 (dt datetime not null, t time not null);
+create table t2 (dt datetime not null);
+insert into t1 values ('2001-01-01 1:1:1', '1:1:1'),
+('2001-01-01 1:1:1', '1:1:1');
+insert into t2 values ('2001-01-01 1:1:1'), ('2001-01-01 1:1:1');
+flush tables;
+EXPLAIN SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
+flush tables;
+SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN (SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.dt IS NULL );
+flush tables;
+EXPLAIN SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN ( SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.t < '2005-11-13 7:41:31' ); 
+flush tables;
+SELECT OUTR.dt FROM t1 AS OUTR WHERE OUTR.dt IN ( SELECT INNR.dt FROM t2 AS INNR WHERE OUTR.t < '2005-11-13 7:41:31' );
+drop tables t1, t2;
+
 # End of 5.0 tests.
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@ -940,6 +940,35 @@ select (select sum(outr.a + t1.a) from t1 limit 1) as tt from t1 as outr order b
 SET sql_mode=@save_sql_mode;
 DROP TABLE t1, t2;

+--echo # 
+--echo # BUG#38072: Wrong result: HAVING not observed in a query with aggregate
+--echo # 
+CREATE TABLE t1 (
+  pk int(11) NOT NULL AUTO_INCREMENT,
+  int_nokey int(11) NOT NULL,
+  int_key int(11) NOT NULL,
+  varchar_key varchar(1) NOT NULL,
+  varchar_nokey varchar(1) NOT NULL,
+  PRIMARY KEY (pk),
+  KEY int_key (int_key),
+  KEY varchar_key (varchar_key)
+);
+INSERT INTO t1 VALUES 
+(1,5,5, 'h','h'),
+(2,1,1, '{','{'),
+(3,1,1, 'z','z'),
+(4,8,8, 'x','x'),
+(5,7,7, 'o','o'),
+(6,3,3, 'p','p'),
+(7,9,9, 'c','c'),
+(8,0,0, 'k','k'),
+(9,6,6, 't','t'),
+(10,0,0,'c','c');
+
+explain SELECT COUNT(varchar_key) AS X FROM t1 WHERE pk = 8 having 'foo'='bar';
+SELECT COUNT(varchar_key) AS X FROM t1 WHERE pk = 8 having 'foo'='bar';
+drop table t1;
+  
 --echo End of 5.0 tests
 # Bug #21174: Index degrades sort performance and 
 #             optimizer does not honor IGNORE INDEX.
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@ -1342,4 +1342,12 @@ where state='User sleep' and
 info='select * from information_schema.columns where 1=sleep(100000)';
 --source include/wait_condition.inc

+
+#
+# Bug#38918 selecting from information_schema.columns is disproportionately slow
+#
+explain select count(*) from information_schema.tables;
+explain select count(*) from information_schema.columns;
+explain select count(*) from information_schema.views;
+
 --echo End of 5.1 tests.
--- a/mysql-test/t/innodb_mysql.test
+++ b/mysql-test/t/innodb_mysql.test
@ -29,3 +29,17 @@ insert into t2 select @a:=A.a+10*(B.a + 10*C.a),@a, @a from t1 A, t1 B, t1 C;
 explain select a from t2 where a=b;
 drop table t1, t2;

+#
+# Bug #40360: Binlog related errors with binlog off
+#
+# This bug is triggered when the binlog format is STATEMENT and the
+# binary log is turned off. In this case, no error should be shown for
+# the statement since there are no replication issues.
+
+SET SESSION BINLOG_FORMAT=STATEMENT;
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+query_vertical select @@session.sql_log_bin, @@session.binlog_format, @@session.tx_isolation;
+CREATE TABLE t1 ( a INT ) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1);
+DROP TABLE t1;
+
--- a/mysql-test/t/limit.test
+++ b/mysql-test/t/limit.test
@ -95,3 +95,11 @@ set @a=-14632475938453979136;
 execute s using @a, @a;

 --echo End of 5.0 tests
+
+#
+# Bug#37075: offset of limit clause might be truncated to 0 on 32-bits server w/o big tables
+#
+
+select 1 as a limit 4294967296,10;
+
+--echo End of 5.1 tests
--- a/mysql-test/t/log_tables.test
+++ b/mysql-test/t/log_tables.test
@ -7,12 +7,24 @@
 # check that CSV engine was compiled in
 --source include/have_csv.inc

-SET @old_general_log_state = @@global.general_log;
-SET @old_slow_log_state = @@global.slow_query_log;
-
 --disable_ps_protocol
 use mysql;

+# Capture initial settings of system variables
+# so that we can revert to old state after manipulation for testing
+# NOTE:  PLEASE USE THESE VALUES TO 'RESET' SYSTEM VARIABLES
+# Capturing old values within the tests results in loss of values
+# due to people not paying attention to previous tests' changes, captures
+# or improper cleanup
+SET @saved_long_query_time = @@long_query_time;
+SET @saved_log_output = @@log_output;
+SET @saved_general_log = @@GLOBAL.general_log;
+SET @saved_slow_query_log = @@GLOBAL.slow_query_log;
+
+SELECT @saved_long_query_time, @saved_log_output, @saved_general_log, @saved_slow_query_log;
+
+
+
 #
 # Check that log tables work and we can do basic selects. This also
 # tests truncate, which works in a special mode with the log tables
@ -164,6 +176,7 @@ set session long_query_time=1;
 select sleep(2);
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
 select * from mysql.slow_log;
+set @@session.long_query_time = @saved_long_query_time;

 #
 # Bug #18559 log tables cannot change engine, and gets deadlocked when
@ -308,6 +321,7 @@ unlock tables;
 # Bug #21785 Server crashes after rename of the log table
 #

+SET SESSION long_query_time = 1000;
 --disable_warnings
 drop table if exists mysql.renamed_general_log;
 drop table if exists mysql.renamed_slow_log;
@ -368,6 +382,7 @@ set global slow_query_log='ON';

 RENAME TABLE general_log2 TO general_log;
 RENAME TABLE slow_log2 TO slow_log;
+SET SESSION long_query_time = @saved_long_query_time;

 # this should work
 set global general_log='ON';
@ -447,7 +462,7 @@ use test;
 #            AUTO_INCREMENT numbers)
 #

-SET @my_log_output= @@global.log_output;
+SET @saved_log_output= @@global.log_output;
 SET GLOBAL LOG_OUTPUT = 'TABLE';

 ## test the general log
@ -480,8 +495,6 @@ ALTER TABLE mysql.general_log ENGINE = CSV;

 ## test the slow query log

-SET @old_long_query_time:=@@long_query_time;
-
 SET GLOBAL slow_query_log = 0;
 FLUSH LOGS;

@ -507,14 +520,14 @@ SELECT "My own slow query", sleep(2);
 SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3;

 SET GLOBAL slow_query_log = 0;
-SET SESSION long_query_time =@old_long_query_time;
+SET SESSION long_query_time =@saved_long_query_time;
 FLUSH LOGS;

 ALTER TABLE mysql.slow_log DROP COLUMN seq;
 ALTER TABLE mysql.slow_log ENGINE = CSV;

-SET GLOBAL general_log = @old_general_log_state;
-SET GLOBAL slow_query_log = @old_slow_log_state;
+SET GLOBAL general_log = @saved_general_log;
+SET GLOBAL slow_query_log = @saved_slow_query_log;

 #
 # Bug#25422 (Hang with log tables)
@ -797,9 +810,6 @@ END //

 DELIMITER ;//

-SET @old_general_log_state = @@global.general_log;
-SET @old_slow_log_state = @@global.slow_query_log;
-
 SET GLOBAL general_log = ON;
 SET GLOBAL slow_query_log = ON;

@ -821,8 +831,8 @@ DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
 DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
 DROP DATABASE IF EXISTS `db_17876`;

-SET GLOBAL general_log = @old_general_log_state;
-SET GLOBAL slow_query_log = @old_slow_log_state;
+SET GLOBAL general_log = @saved_general_log;
+SET GLOBAL slow_query_log = @saved_slow_query_log;

 #
 # Bug#21557 entries in the general query log truncated at 1000 characters.
@ -830,7 +840,6 @@ SET GLOBAL slow_query_log = @old_slow_log_state;

 select CONNECTION_ID() into @thread_id;
 truncate table mysql.general_log;
-set @old_general_log_state = @@global.general_log;
 set global general_log = on;
 --disable_result_log
 set @lparam = "000 001 002 003 004 005 006 007 008 009"
@ -941,7 +950,7 @@ execute long_query using @lparam;
 set global general_log = off;
 select command_type, argument from mysql.general_log where thread_id = @thread_id;
 deallocate prepare long_query;
-set global general_log = @old_general_log_state;
+set global general_log = @saved_general_log;

 #
 # Bug#34306: Can't make copy of log tables when server binary log is enabled
@ -955,9 +964,6 @@ DROP TABLE IF EXISTS general_log_copy;

 CREATE TABLE log_count (count BIGINT(21));

-SET @old_general_log_state = @@global.general_log;
-SET @old_slow_log_state = @@global.slow_query_log;
-
 SET GLOBAL general_log = ON;
 SET GLOBAL slow_query_log = ON;

@ -984,15 +990,14 @@ INSERT INTO general_log_copy SELECT * FROM mysql.general_log;
 INSERT INTO log_count (count) VALUES ((SELECT count(*) FROM mysql.general_log));
 DROP TABLE general_log_copy;

-SET GLOBAL general_log = @old_general_log_state;
-SET GLOBAL slow_query_log = @old_slow_log_state;
+SET GLOBAL general_log = @saved_general_log;
+SET GLOBAL slow_query_log = @saved_slow_query_log;

 DROP TABLE log_count;

 #
 # Bug #31700: thd->examined_row_count not incremented for 'const' type queries
 #
-SET @old_slow_log_state = @@global.slow_query_log;

 SET SESSION long_query_time = 0;
 SET GLOBAL slow_query_log = ON;
@ -1017,7 +1022,9 @@ DROP TABLE t1;

 TRUNCATE TABLE mysql.slow_log;

-SET GLOBAL log_output= @my_log_output;
-SET GLOBAL slow_query_log = @old_slow_log_state;
-SET SESSION long_query_time =@old_long_query_time;
-
+# RESET altered system variables before exiting the test
+SET GLOBAL log_output= @saved_log_output;
+SET GLOBAL slow_query_log = @saved_slow_query_log;
+SET GLOBAL general_log=@saved_general_log;
+SET SESSION long_query_time =@saved_long_query_time;
+SET GLOBAL LOG_OUTPUT = @saved_log_output;
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@ -456,7 +456,7 @@ CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
 SELECT * FROM t2;
 DROP TABLE t1, t2;
 CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM t2;
 DROP TABLE t2;

@ -548,11 +548,11 @@ drop table t1;
 #             CREATE TABLE fails
 #
 CREATE TABLE tm1(a INT) ENGINE=MERGE UNION=(t1, t2);
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM tm1;
 CHECK TABLE tm1;
 CREATE TABLE t1(a INT);
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM tm1;
 CHECK TABLE tm1;
 CREATE TABLE t2(a BLOB);
@ -878,7 +878,7 @@ DROP TABLE t4;
 --echo # 2. Normal rename.
 SELECT * FROM t3 ORDER BY c1;
 RENAME TABLE t2 TO t5;
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM t3 ORDER BY c1;
 RENAME TABLE t5 TO t2;
 SELECT * FROM t3 ORDER BY c1;
@ -896,7 +896,7 @@ UNLOCK TABLES;
 --echo #
 --echo # 4. Alter table rename.
 ALTER TABLE t2 RENAME TO t5;
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM t3 ORDER BY c1;
 ALTER TABLE t5 RENAME TO t2;
 SELECT * FROM t3 ORDER BY c1;
@ -956,7 +956,7 @@ CREATE TABLE t2 (c1 INT, INDEX(c1)) ENGINE=MRG_MYISAM UNION=(t1)
 LOCK TABLES t1 WRITE, t2 WRITE;
 INSERT INTO t1 VALUES (1);
 DROP TABLE t1;
--error ER_NO_SUCH_TABLE
+--error 1168
 SELECT * FROM t2;
 --error ER_NO_SUCH_TABLE
 SELECT * FROM t1;
@ -1394,6 +1394,19 @@ FLUSH TABLES m1, t1;
 UNLOCK TABLES;
 DROP TABLE t1, m1;

+#
+# Bug#35068 - Assertion fails when reading from i_s.tables
+#             and there is incorrect merge table
+#
+CREATE TABLE tm1 (c1 INT) ENGINE=MRG_MYISAM UNION=(t1) INSERT_METHOD=FIRST;
+--replace_column 8 # 9 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 17 # 19 # 20 #
+SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE
+TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
+
+DROP TABLE tm1;
+
+--echo End of 5.1 tests
+
 #
 # Bug#36006 - Optimizer does table scan for select count(*)
 #
--- a/mysql-test/t/metadata.test
+++ b/mysql-test/t/metadata.test
@ -112,4 +112,21 @@ SELECT v1.c1, v2.c2 FROM v1 JOIN v2 ON c1=c2 GROUP BY v1.c1 ORDER BY v2.c2;
 DROP VIEW v1,v2;
 DROP TABLE t1,t2;

+#
+# Bug #39283: Date returned as VARBINARY to client for queries
+#             with COALESCE and JOIN
+#
+
+CREATE TABLE t1 (i INT, d DATE);
+INSERT INTO t1 VALUES (1, '2008-01-01'), (2, '2008-01-02'), (3, '2008-01-03');
+
+--enable_metadata
+--sorted_result
+SELECT COALESCE(d, d), IFNULL(d, d), IF(i, d, d),
+       CASE i WHEN i THEN d ELSE d END, GREATEST(d, d), LEAST(d, d)
+  FROM t1 ORDER BY RAND(); # force filesort
+--disable_metadata
+
+DROP TABLE t1;
+
 --echo End of 5.0 tests
--- a/mysql-test/t/order_by.test
+++ b/mysql-test/t/order_by.test
@ -847,6 +847,26 @@ set session max_sort_length= 2180;
 select * from t1 order by b;
 drop table t1;

+
+--echo #
+--echo # Bug #39844: Query Crash Mysql Server 5.0.67
+--echo #
+
+CREATE TABLE t1 (a INT PRIMARY KEY);
+CREATE TABLE t2 (a INT PRIMARY KEY, b INT);
+CREATE TABLE t3 (c INT);
+
+INSERT INTO t1 (a) VALUES (1), (2);
+INSERT INTO t2 (a,b) VALUES (1,2), (2,3);
+INSERT INTO t3 (c) VALUES (1), (2);
+
+SELECT
+  (SELECT t1.a FROM t1, t2 WHERE t1.a = t2.b AND t2.a = t3.c ORDER BY t1.a)
+  FROM t3;
+
+DROP TABLE t1, t2, t3;
+
+
 #
 # Bug #35206: select query result different if the key is indexed or not
 #
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@ -14,6 +14,35 @@
 drop table if exists t1, t2;
 --enable_warnings

+#
+# Bug#40494: Crash MYSQL server crashes on range access with partitioning
+#            and order by
+#
+CREATE TABLE t1 (a INT NOT NULL, KEY(a))
+PARTITION BY RANGE(a)
+(PARTITION p1 VALUES LESS THAN (200), PARTITION pmax VALUES LESS THAN MAXVALUE);
+INSERT INTO t1 VALUES (2), (40), (40), (70), (60), (90), (199);
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 95 ORDER BY a ASC;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 95;
+INSERT INTO t1 VALUES (200), (250), (210);
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 220 ORDER BY a ASC;
+SELECT a FROM t1 WHERE a BETWEEN 200 AND 220 ORDER BY a ASC;
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 95 ORDER BY a DESC;
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 220 ORDER BY a DESC;
+SELECT a FROM t1 WHERE a BETWEEN 200 AND 220 ORDER BY a DESC;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 220;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 200 AND 220;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 95;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 60 AND 220;
+--sorted_result
+SELECT a FROM t1 WHERE a BETWEEN 200 AND 220;
+DROP TABLE t1;
+
 #
 # Bug35931: Index search may return duplicates
 #
@ -120,7 +149,10 @@ CREATE TABLE `t1` (
 CREATE TABLE `t2` (
  `c1` int(11) DEFAULT NULL,
  KEY `c1` (`c1`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (c1) (PARTITION a VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION b VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (c1)
+(PARTITION a VALUES LESS THAN (100) ENGINE = MyISAM,
+ PARTITION b VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */;

 INSERT INTO `t1` VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
 INSERT INTO `t2` VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12),(13),(14),(15),(16),(17),(18),(19),(20);
--- a/mysql-test/t/partition_innodb.test
+++ b/mysql-test/t/partition_innodb.test
@ -1,6 +1,46 @@
 --source include/have_partition.inc
 --source include/have_innodb.inc

+#
+# Bug37721: ORDER BY when WHERE contains non-partitioned index column
+# wrong order since it did not use pk as second compare
+--echo # Bug#37721, test of ORDER BY on PK and WHERE on INDEX
+CREATE TABLE t1 (
+  a INT,
+  b INT,
+  PRIMARY KEY (a),
+  INDEX (b))
+ENGINE InnoDB
+PARTITION BY HASH(a)
+PARTITIONS 3;
+# This will give the middle partition the highest value
+INSERT INTO t1 VALUES (0,0),(4,0),(2,0);
+SELECT a FROM t1 WHERE b = 0 ORDER BY a ASC;
+SELECT a FROM t1 WHERE b = 0 ORDER BY a DESC;
+ALTER TABLE t1 DROP INDEX b;
+SELECT a FROM t1 WHERE b = 0 ORDER BY a ASC;
+SELECT a FROM t1 WHERE b = 0 ORDER BY a DESC;
+DROP TABLE t1;
+CREATE TABLE t1 (
+  a VARCHAR(600),
+  b VARCHAR(600),
+  PRIMARY KEY (a),
+  INDEX (b))
+ENGINE InnoDB
+PARTITION BY KEY(a)
+PARTITIONS 3;
+# This will give the middle partition the highest value
+INSERT INTO t1 VALUES (concat(repeat('MySQL',100),'1'),repeat('0',257));
+INSERT INTO t1 VALUES (concat(repeat('MySQL',100),'3'),repeat('0',257));
+INSERT INTO t1 VALUES (concat(repeat('MySQL',100),'2'),repeat('0',257));
+SELECT right(a,1) FROM t1 WHERE b = repeat('0',257) ORDER BY a ASC;
+SELECT right(a,1) FROM t1 WHERE b = repeat('0',257) ORDER BY a DESC;
+ALTER TABLE t1 DROP INDEX b;
+SELECT right(a,1) FROM t1 WHERE b = repeat('0',257) ORDER BY a ASC;
+SELECT right(a,1) FROM t1 WHERE b = repeat('0',257) ORDER BY a DESC;
+DROP TABLE t1;
+
+#
 # Bug#32948 - FKs allowed to reference partitioned table
 #
 -- echo # Bug#32948
--- a/mysql-test/t/partition_innodb_stmt.test
+++ b/mysql-test/t/partition_innodb_stmt.test
@ -0,0 +1,59 @@
+--source include/have_binlog_format_statement.inc
+--source include/have_innodb.inc
+
+--echo # connection default
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+
+CREATE TABLE t1
+(
+  id SMALLINT NOT NULL,
+  PRIMARY KEY (id)
+) ENGINE=innodb
+PARTITION BY RANGE (id)
+(
+  PARTITION p1 VALUES LESS THAN (2),
+  PARTITION p2 VALUES LESS THAN (4),
+  PARTITION p3 VALUES LESS THAN (10)
+);
+
+INSERT INTO t1 VALUES (1),(2),(3);
+
+--echo # Test READ COMMITTED -> REPEATABLE READ
+FLUSH TABLES;
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+SELECT * FROM t1;
+
+connect (con1, localhost, root,,);
+connection con1;
+
+--echo #connection con1
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+INSERT INTO t1 VALUES(7);
+COMMIT;
+
+connection default;
+--echo # connection default
+COMMIT;
+
+FLUSH TABLES;
+
+--echo # Test REPEATABLE READ -> READ COMMITTED
+SET TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+BEGIN;
+SELECT * FROM t1;
+
+connection con1;
+
+--echo # connection con1
+SET TRANSACTION ISOLATION LEVEL READ COMMITTED;
+BEGIN;
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+INSERT INTO t1 VALUES(9);
+COMMIT;
+
+disconnect con1;
+connection default;
+COMMIT;
+DROP TABLE t1;
--- a/mysql-test/t/partition_mgm.test
+++ b/mysql-test/t/partition_mgm.test
@ -53,3 +53,27 @@ alter table t1 REORGANIZE partition p1 INTO
 partition p12 values in (3,4));

 drop table t1;
+#
+# Verification tests for bug#14326
+#
+--error ER_PARSE_ERROR
+CREATE TABLE t1 (a INT)
+/*!50100 PARTITION BY HASH (a)
+/* Test
+   of multi-line
+   comment */
+PARTITIONS 5 */;
+CREATE TABLE t1 (a INT)
+/*!50100 PARTITION BY HASH (a)
+-- with a single line comment embedded
+PARTITIONS 5 */;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+CREATE TABLE t1 (a INT)
+/*!50100 PARTITION BY HASH (a)
+PARTITIONS 5 */;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+CREATE TABLE t1 (a INT) /*!50100 PARTITION BY HASH (a) PARTITIONS 5 */;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
--- a/mysql-test/t/partition_mgm_err.test
+++ b/mysql-test/t/partition_mgm_err.test
@ -125,6 +125,18 @@ ALTER TABLE t1 DROP PARTITION x1;
 --error ER_PARTITION_MGMT_ON_NONPARTITIONED
 ALTER TABLE t1 COALESCE PARTITION 1;

+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
+ALTER TABLE t1 ANALYZE PARTITION p1;
+
+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
+ALTER TABLE t1 CHECK PARTITION p1;
+
+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
+ALTER TABLE t1 OPTIMIZE PARTITION p1;
+
+--error ER_PARTITION_MGMT_ON_NONPARTITIONED
+ALTER TABLE t1 REPAIR PARTITION p1;
+
 DROP TABLE t1;

 CREATE TABLE t1 (a int)
--- a/mysql-test/t/partition_not_windows.test
+++ b/mysql-test/t/partition_not_windows.test
@ -3,8 +3,6 @@
 --source include/have_partition.inc
 # DATA DIRECTORY/INDEX DIRECTORY require symbolic link support
 --source include/have_symlink.inc
-# realpath is not compiled in when building with valgrind
--source include/not_valgrind.inc

 # The test for Bug 20770 is disabled on Windows due to BUG#19107; it
 # should be moved into partition.test once the bug has been resolved.
--- a/mysql-test/t/ps_11bugs.test
+++ b/mysql-test/t/ps_11bugs.test
@ -177,4 +177,41 @@ select * from t2;
 drop table t1;
 drop table t2;

+#
+# Bug #32124: crash if prepared statements refer to variables in the where
+# clause
+#
+
+CREATE TABLE t1 (a INT);
+PREPARE stmt FROM 'select 1 from `t1` where `a` = any (select (@@tmpdir))';
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1;
+
+CREATE TABLE t2 (a INT PRIMARY KEY);
+INSERT INTO t2 VALUES (400000), (400001);
+
+SET @@sort_buffer_size=400000;
+
+DELIMITER |;
+
+CREATE FUNCTION p1(i INT) RETURNS INT
+BEGIN
+  SET @@sort_buffer_size= i;
+  RETURN i + 1;
+END|
+
+DELIMITER ;|
+
+SELECT * FROM t2 WHERE a = @@sort_buffer_size AND p1(@@sort_buffer_size + 1) > a - 1;
+
+DROP TABLE t2;
+DROP FUNCTION p1;
+
+
+SELECT CONCAT(@@sort_buffer_size);
+SELECT LEFT("12345", @@ft_boolean_syntax);
+
+SET @@sort_buffer_size=DEFAULT;
+
 --echo End of 5.0 tests.
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@ -7997,8 +7997,24 @@ select (select func30787(f1)) as ttt from t1;
 drop function func30787;
 drop table t1;

-###########################################################################
+#
+# Bug #33811: Call to stored procedure with SELECT * / RIGHT JOIN fails
+# after the first time
+#
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);

+CREATE PROCEDURE test_sp()
+  SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
+
+CALL test_sp();
+CALL test_sp();
+
+DROP PROCEDURE test_sp;
+DROP TABLE t1;
+
+
+###########################################################################
 #
 # Bug#38291 memory corruption and server crash with view/sp/function
 #
@ -8041,6 +8057,28 @@ delimiter ;$
 call `p2`('s s s s s s');
 drop procedure `p2`;

+#
+# Bug#38823: Invalid memory access when a SP statement does wildcard expansion
+#
+
+--disable_warnings
+drop table if exists t1;
+drop procedure if exists p1;
+--enable_warnings
+
+delimiter $;
+create procedure p1() begin select * from t1; end$
+--error ER_NO_SUCH_TABLE
+call p1$
+create table t1 (a integer)$
+call p1$
+alter table t1 add b integer;
+call p1$
+delimiter ;$
+
+drop table t1;
+drop procedure p1;
+
 --echo # ------------------------------------------------------------------
 --echo # -- End of 5.0 tests
 --echo # ------------------------------------------------------------------
--- a/mysql-test/t/subselect3.test
+++ b/mysql-test/t/subselect3.test
@ -618,6 +618,28 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0);

 DROP TABLE t1, t2;

+#
+# Bug #37894: Assertion in init_read_record_seq in handler.h line 1444
+#
+
+CREATE TABLE t1 (
+  pk INT PRIMARY KEY,
+  int_key INT,
+  varchar_key VARCHAR(5) UNIQUE,
+  varchar_nokey VARCHAR(5)
+);
+INSERT INTO t1 VALUES (9, 7,NULL,NULL), (10,8,'p' ,'p');
+
+SELECT varchar_nokey
+FROM t1
+WHERE NULL NOT IN (
+ SELECT INNR.pk FROM t1 AS INNR2
+   LEFT JOIN t1 AS INNR ON ( INNR2.int_key = INNR.int_key )
+   WHERE INNR.varchar_key > 'n{'
+);
+
+DROP TABLE t1;
+
 --echo End of 5.0 tests

 #
--- a/mysql-test/t/thread_cache_size_func.test
+++ b/mysql-test/t/thread_cache_size_func.test
@ -1,26 +1,27 @@
-############# mysql-test\t\thread_cache_size_func.test #######################################
-#                                                                                       #
-# Variable Name: thread_cache_size                                                      #
-# Scope: SESSION                                                                        #
-# Access Type: Dynamic                                                                  #
-# Data Type: Enumeration                                                                #
-# Default Value: 0                                                                      #
-# Values:      0-16384                                                                  #
-#                                                                                       #
-#                                                                                       #
-# Creation Date: 2008-03-02                                                             #
-# Author:  Sharique Abdullah                                                                #
-#                                                                                       #
-# Description: Test Cases of Dynamic System Variable "thread_cache_size"                #
-#              that checks behavior of this variable in the following ways              #
-#              * Functionality based on different values                                #
-#                                                                                       #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html        #
-# option_mysqld_thread_cache_size                                                       #
-#                                                                                       #
-#########################################################################################
-
-
+############# mysql-test\t\thread_cache_size_func.test ##########################
+#                                                                               #
+# Variable Name: thread_cache_size                                              #
+# Scope: SESSION                                                                #
+# Access Type: Dynamic                                                          #
+# Data Type: Enumeration                                                        #
+# Default Value: 0                                                              #
+# Values:      0-16384                                                          #
+#                                                                               #
+#                                                                               #
+# Creation Date: 2008-03-02                                                     #
+# Author:  Sharique Abdullah                                                    #
+#                                                                               #
+# Modified: HHunger 2008-08-27 Reduced test to needed function and inserted     #
+#                              wait-loops                                       #
+#                                                                               #
+# Description: Test Cases of Dynamic System Variable "thread_cache_size"        #
+#              that checks behavior of this variable in the following ways      #
+#              * Functionality based on different values                        #
+#                                                                               #
+# Reference:                                                                    #
+#   http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html         #
+#                                                                               #
+#################################################################################

 #
 # Setup
@ -32,41 +33,31 @@ SET @global_thread_cache_size = @@GLOBAL.thread_cache_size;

 FLUSH STATUS;

-#
-# Greater than cache threads, setting cache size to 3
-#
 -- ECHO '# Test1#'
 SET @@GLOBAL.thread_cache_size=3;
-
-let $threadsCreated1 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
--echo Saving threads cached, threads created values
-
 SHOW STATUS LIKE 'Threads_cached';
 --echo 0 Expected

--ECHO '#Old value for thread_cache'#
-
 ##################################
 # Make 4 connections             #
 ##################################

 --echo ** Connecting conn1 using username 'root' **
-connect (conn1,localhost,root,,);
+CONNECT (conn1,localhost,root,,);
 --echo ** Connecting conn2 using username 'root' **
-connect (conn2,localhost,root,,);
+CONNECT (conn2,localhost,root,,);
 --echo ** Connecting conn3 using username 'root' **
-connect (conn3,localhost,root,,);
+CONNECT (conn3,localhost,root,,);
 --echo ** Connecting conn4 using username 'root' **
-connect (conn4,localhost,root,,);
+CONNECT (conn4,localhost,root,,);

-let $threadsCreated2 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
--echo Saving threads cached, threads created values
+--echo ** Connection default **
+CONNECTION default;

--disable_query_log
-eval SELECT ($threadsCreated2 - $threadsCreated1) AS 'Threads Created Difference';
--enable_query_log
+# Wait until all connections done
+let $wait_condition= SELECT COUNT(*)= 5 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc

--echo 4 Expected
 SHOW STATUS LIKE 'Threads_cached';
 --echo 0 Expected

@ -74,85 +65,54 @@ SHOW STATUS LIKE 'Threads_cached';
 #Disconnecting all the connections #
 ####################################

--echo ** Connection default **
-connection default;
-
 --echo ** Disconnecting conn1,conn2,conn3,conn4 **
-disconnect conn1;
-disconnect conn2;
-disconnect conn3;
-disconnect conn4;
+DISCONNECT conn1;
+DISCONNECT conn2;
+DISCONNECT conn3;
+DISCONNECT conn4;

 #
 # Checking the status
 #

--echo '#new  values for thread cache after disconnecting'#
-let $threadsCreated3 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
+# Wait until all disconnects ready
+let $wait_condition= SELECT COUNT(*)= 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc

--echo Saving threads cached, threads created values
--disable_query_log
-eval SELECT ($threadsCreated3 - $threadsCreated2) AS 'Threads Created Difference';
--enable_query_log
--echo 0 Expected
 SHOW STATUS LIKE 'Threads_cached';
 --echo 3 Expected

-
 #
 # Decreasing cache size to 1
 #
-SET @@GLOBAL.thread_cache_size=1;
-
-connection default;
-
-let $threadsCreated6 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
--echo Saving threads cached, threads created values
--disable_query_log
-eval SELECT $threadsCreated6 - $threadsCreated3 AS 'Threads Created Difference';
--enable_query_log
--echo 0 Expected
-SHOW STATUS LIKE 'Threads_cached';
--echo 1 Expected
--echo Bug: The number of threads cached should have decreased with cache size decrease.
+SET @@GLOBAL.thread_cache_size= 1;

 --echo ** Connecting conn1 using username 'root' **
 CONNECT (conn1,localhost,root,,);
 --echo ** Connecting conn2 using username 'root' **
 CONNECT (conn2,localhost,root,,);

-let $threadsCreated4 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
--echo Saving threads cached, threads created values
--disable_query_log
-eval SELECT $threadsCreated4 - $threadsCreated3 AS 'Threads Created Difference';
--enable_query_log
--echo 1 Expected
--echo Bug: The number of threads created should have increased because the cache should have 1 thread only
-SHOW STATUS LIKE 'Threads_cached';
--echo 0 Expected
--echo Bug: The number of threads created should have decreased because atleast 1 new connection came in
+--echo connection default;
+CONNECTION default;

--echo ** Connection default **
-connection default;
+# Wait until all connects ready
+let $wait_condition= SELECT COUNT(*)= 3 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc

 --echo ** Disconnecting conn1,conn2 **
-disconnect conn1;
-disconnect conn2;
+DISCONNECT conn1;
+DISCONNECT conn2;
+
+# Wait until all disconnects ready
+let $wait_condition= SELECT COUNT(*)= 1 FROM INFORMATION_SCHEMA.PROCESSLIST;
+--source include/wait_condition.inc

--ECHO '#new status values for thread cache'#
-let $threadsCreated5 = query_get_value(SHOW STATUS LIKE 'Threads_created', Value, 1);
--echo Saving threads cached, threads created values
--disable_query_log
-eval SELECT ($threadsCreated5 - $threadsCreated4) AS 'Threads Created Difference';
--enable_query_log
--echo 0 Expected
 SHOW STATUS LIKE 'Threads_cached';
 --echo 1 Expected

--echo Saving threads cached, threads created values
-
 #
 # Cleanup
 #

 SET @@GLOBAL.thread_cache_size = @global_thread_cache_size;
+
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@ -3556,6 +3556,15 @@ DROP VIEW v1;

 ###########################################################################

+#
+# Bug#39040: valgrind errors/crash when creating views with binlog logging 
+# enabled
+#
+# Bug is visible only when running in valgrind with binary logging.
+CREATE VIEW v1 AS SELECT 1;
+DROP VIEW v1;
+
+
 --echo # -----------------------------------------------------------------
 --echo # -- End of 5.0 tests.
 --echo # -----------------------------------------------------------------
--- a/mysql-test/t/windows.test
+++ b/mysql-test/t/windows.test
@ -33,6 +33,7 @@ drop table t1;
 #
 CREATE TABLE t1 (a int, b int); INSERT INTO t1 VALUES (1,1);
 EXPLAIN SELECT * FROM t1 WHERE b =  (SELECT max(2));
+DROP TABLE t1;

 --echo End of 5.0 tests.

--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@ -74,3 +74,48 @@ xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';
 select * from t1;
 drop table t1;

+disconnect con1;
+
+#
+# Bug#28323: Server crashed in xid cache operations
+#
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1(a int, b int, c varchar(20), primary key(a)) engine = innodb;
+insert into t1 values(1, 1, 'a');
+insert into t1 values(2, 2, 'b');
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+--connection con1
+xa start 'a','b';
+update t1 set c = 'aa' where a = 1;
+--connection con2
+xa start 'a','c';
+update t1 set c = 'bb' where a = 2;
+--connection con1
+--send update t1 set c = 'bb' where a = 2
+--connection con2
+--sleep 1
+--error ER_LOCK_DEADLOCK
+update t1 set c = 'aa' where a = 1;
+select count(*) from t1;
+--error ER_XA_RBDEADLOCK
+xa end 'a','c';
+xa rollback 'a','c';
+--disconnect con2
+
+connect (con3,localhost,root,,);
+--connection con3
+xa start 'a','c';
+
+--disconnect con1
+--disconnect con3
+--connection default
+drop table t1;
+
+--echo End of 5.0 tests