merge w/ 5.2

7 files changed, 14 insertions, 6 deletions

diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index a87ade614b8..c432732b1f9 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -412,6 +412,7 @@ Variable_name	Value
 Key_blocks_not_flushed	0
 Key_blocks_unused	KEY_BLOCKS_UNUSED
 Key_blocks_used	4
+Key_blocks_warm	0
 Key_read_requests	22
 Key_reads	0
 Key_write_requests	26
@@ -459,6 +460,7 @@ Variable_name	Value
 Key_blocks_not_flushed	0
 Key_blocks_unused	KEY_BLOCKS_UNUSED
 Key_blocks_used	4
+Key_blocks_warm	0
 Key_read_requests	22
 Key_reads	0
 Key_write_requests	26
@@ -501,6 +503,7 @@ Variable_name	Value
 Key_blocks_not_flushed	0
 Key_blocks_unused	KEY_BLOCKS_UNUSED
 Key_blocks_used	4
+Key_blocks_warm	0
 Key_read_requests	22
 Key_reads	0
 Key_write_requests	26
diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result
index 375f31ef9c4..a5e71e114ca 100644
--- a/mysql-test/r/ps_ddl.result
+++ b/mysql-test/r/ps_ddl.result
@@ -4,6 +4,7 @@ drop procedure if exists p_verify_reprepare_count;
 drop procedure if exists p1;
 drop function if exists f1;
 drop view if exists v1, v2;
+TRUNCATE TABLE mysql.general_log;
 create procedure p_verify_reprepare_count(expected int)
 begin
 declare old_reprepare_count int default @reprepare_count;
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test b/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
index 63e65834e5b..69b481bddd1 100644
--- a/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_symlink.test
@@ -3,8 +3,8 @@
 # This test verifies if loading data infile will work fine 
 # if the path of the load data file is a symbolic link.
 #
---source include/master-slave.inc
 --source include/not_windows.inc
+--source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
 
 create table t1(a int not null auto_increment, b int, primary key(a) );
diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
index daf59c38a7e..4f6b960f9d0 100644
--- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
@@ -407,7 +407,7 @@ let $rows = 1;
 --source suite/vcol/inc/vcol_supported_sql_funcs.inc
 
 --echo # LIKE
-let $cols = a varchar(10), b bool as (a like 'H%o');
+let $cols = a varchar(10), b bool as (a like 'H%!o' escape '!');
 let $values1 = 'Hello',default;
 let $values2 = 'MySQL',default;
 let $rows = 2;
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
index 2bc652a7da2..83f755a2e7f 100644
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result
@@ -968,12 +968,12 @@ drop table t1;
 set sql_warnings = 0;
 # LIKE
 set sql_warnings = 1;
-create table t1 (a varchar(10), b bool as (a like 'H%o'));
+create table t1 (a varchar(10), b bool as (a like 'H%!o' escape '!'));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(10) DEFAULT NULL,
-  `b` tinyint(1) AS (a like 'H%o') VIRTUAL
+  `b` tinyint(1) AS (a like 'H%!o' escape '!') VIRTUAL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 insert into t1 values ('Hello',default);
 insert into t1 values ('MySQL',default);
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
index a94e220180c..844aae38af2 100644
--- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result
@@ -968,12 +968,12 @@ drop table t1;
 set sql_warnings = 0;
 # LIKE
 set sql_warnings = 1;
-create table t1 (a varchar(10), b bool as (a like 'H%o'));
+create table t1 (a varchar(10), b bool as (a like 'H%!o' escape '!'));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(10) DEFAULT NULL,
-  `b` tinyint(1) AS (a like 'H%o') VIRTUAL
+  `b` tinyint(1) AS (a like 'H%!o' escape '!') VIRTUAL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('Hello',default);
 insert into t1 values ('MySQL',default);
diff --git a/mysql-test/t/ps_ddl.test b/mysql-test/t/ps_ddl.test
index 1543c757908..10a96285451 100644
--- a/mysql-test/t/ps_ddl.test
+++ b/mysql-test/t/ps_ddl.test
@@ -58,6 +58,10 @@ drop function if exists f1;
 drop view if exists v1, v2;
 --enable_warnings
 
+# Avoid selecting from a huge table possibly left over from previous tests,
+# as this really hurts --valgrind testing.
+TRUNCATE TABLE mysql.general_log;
+
 delimiter |;
 create procedure p_verify_reprepare_count(expected int)
 begin