Merge mysql.com:/home/my/mysql-5.0

into  mysql.com:/home/my/mysql-5.1

mysql-test/extra/binlog_tests/binlog.test

@@ -2,6 +2,7 @@
 # misc binlogging tests that do not require a slave running
 #
 
+-- source include/not_embedded.inc
 -- source include/have_bdb.inc
 -- source include/have_innodb.inc
 -- source include/have_debug.inc

mysql-test/extra/binlog_tests/blackhole.test

@@ -2,6 +2,7 @@
 # Simple test for blackhole example
 # Taken from the select test
 #
+-- source include/not_embedded.inc
 -- source include/have_blackhole.inc
 
 --disable_warnings

mysql-test/extra/binlog_tests/ctype_cp932.test

@@ -398,28 +398,6 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
-# Test prepared statement with 0x8300 sequence in parameter while
-# running with cp932 client character set.
-RESET MASTER;
-CREATE TABLE t1(f1 blob);
-PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
-SET @var1= x'8300';
-# TODO: Note that this doesn't actually test the code which was added for
-# bug#11338 because this syntax for prepared statements causes the PS to
-# be replicated differently than if we executed the PS from C or Java.
-# Using this syntax, variable names are inserted into the binlog instead
-# of values. The real goal of this test is to check the code that was
-# added to Item_param::query_val_str() in order to do hex encoding of
-# PS parameters when the client character set is cp932;
-# Bug#11338 has an example java program which can be used to verify this 
-# code (and I have used it to test the fix) until there is some way to
-# exercise this code from mysql-test-run.
-EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 102;
-SELECT HEX(f1) FROM t1;
-DROP table t1;
-# end test for bug#11338
-
 SET collation_connection='cp932_japanese_ci';
 -- source include/ctype_filesort.inc
 SET collation_connection='cp932_bin';

mysql-test/r/binlog_stm_ctype_cp932.result

@@ -11315,20 +11315,6 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
-RESET MASTER;
-CREATE TABLE t1(f1 blob);
-PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
-SET @var1= x'8300';
-EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	102	Query	1	189	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	189	User var	1	228	@`var1`=_binary 0x8300 COLLATE binary
-master-bin.000001	228	Query	1	321	use `test`; INSERT INTO t1 VALUES(@'var1')
-SELECT HEX(f1) FROM t1;
-HEX(f1)
-8300
-DROP table t1;
 SET collation_connection='cp932_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;

mysql-test/r/ctype_cp932_notembedded.result

@@ -6,11 +6,11 @@ CREATE TABLE t1(f1 blob);
 PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
 SET @var1= x'8300';
 EXECUTE stmt1 USING @var1;
-SHOW BINLOG EVENTS FROM 102;
+SHOW BINLOG EVENTS FROM 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
-master-bin.000001	#	Table_map	1	#	test.t1
-master-bin.000001	#	Write_rows	1	#	
+master-bin.000001	98	Query	1	185	use `test`; CREATE TABLE t1(f1 blob)
+master-bin.000001	185	User var	1	224	@`var1`=_binary 0x8300 COLLATE binary
+master-bin.000001	224	Query	1	317	use `test`; INSERT INTO t1 VALUES(@'var1')
 SELECT HEX(f1) FROM t1;
 HEX(f1)
 8300

mysql-test/r/innodb_notembedded.result

@@ -1,3 +1,4 @@
+drop table if exists t1;
 create table t1 (col1 integer primary key, col2 integer) engine=innodb;
 insert t1 values (1,100);
 create function f1 () returns integer begin

mysql-test/r/sp_notembedded.result

@@ -117,7 +117,7 @@ create procedure bug10100p(prm int, inout res int)
 begin
 set res = res * prm;
 if prm > 1 then
-call bug10100p(prm - 1, res);  
+call bug10100p(prm - 1, res);
 end if;
 end|
 create procedure bug10100t(prm int)

mysql-test/r/subselect.result

@@ -2987,7 +2987,6 @@ select * from (select max(fld) from t1) as foo;
 max(fld)
 1
 drop table t1;
-purge master logs before (select adddate(current_timestamp(), interval -4 day));
 CREATE TABLE t1 (a int, b int);
 CREATE TABLE t2 (c int, d int);
 CREATE TABLE t3 (e int);

mysql-test/t/ctype_cp932_notembedded.test

@@ -0,0 +1,32 @@
+-- source include/not_embedded.inc
+-- source include/have_cp932.inc
+
+--character_set cp932
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+set names cp932;
+set character_set_database = cp932;
+
+# Test prepared statement with 0x8300 sequence in parameter while
+# running with cp932 client character set.
+RESET MASTER;
+CREATE TABLE t1(f1 blob);
+PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
+SET @var1= x'8300';
+# TODO: Note that this doesn't actually test the code which was added for
+# bug#11338 because this syntax for prepared statements causes the PS to
+# be replicated differently than if we executed the PS from C or Java.
+# Using this syntax, variable names are inserted into the binlog instead
+# of values. The real goal of this test is to check the code that was
+# added to Item_param::query_val_str() in order to do hex encoding of
+# PS parameters when the client character set is cp932;
+# Bug#11338 has an example java program which can be used to verify this 
+# code (and I have used it to test the fix) until there is some way to
+# exercise this code from mysql-test-run.
+EXECUTE stmt1 USING @var1;
+SHOW BINLOG EVENTS FROM 98;
+SELECT HEX(f1) FROM t1;
+DROP table t1;
+# end test for bug#11338

mysql-test/t/innodb_notembedded.test

@@ -1,6 +1,10 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
 connect (a,localhost,root,,);
 connect (b,localhost,root,,);
 

mysql-test/t/sp-destruct.test

@@ -54,10 +54,13 @@ flush table mysql.proc;
 
 # Thrashing the .frm file
 --system echo 'saljdlfa' > $MYSQLTEST_VARDIR/master-data/mysql/proc.frm
+--replace_result $MYSQLTEST_VARDIR . master-data// ''
 --error ER_NOT_FORM_FILE
 call bug14233();
+--replace_result $MYSQLTEST_VARDIR . master-data// ''
 --error ER_NOT_FORM_FILE
 create view v1 as select bug14233_f();
+--replace_result $MYSQLTEST_VARDIR . master-data// ''
 --error ER_NOT_FORM_FILE
 insert into t1 values (0);
 

mysql-test/t/sp.test

@@ -699,10 +699,11 @@ drop procedure into_test4|
 --disable_warnings
 drop procedure if exists into_outfile|
 --enable_warnings
-create procedure into_outfile(x char(16), y int)
+--replace_result $MYSQLTEST_VARDIR ..
+eval create procedure into_outfile(x char(16), y int)
 begin
   insert into test.t1 values (x, y);
-  select * into outfile "../tmp/spout" from test.t1;
+  select * into outfile "$MYSQLTEST_VARDIR/tmp/spout" from test.t1;
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 
@@ -715,10 +716,11 @@ drop procedure into_outfile|
 --disable_warnings
 drop procedure if exists into_dumpfile|
 --enable_warnings
-create procedure into_dumpfile(x char(16), y int)
+--replace_result $MYSQLTEST_VARDIR ..
+eval create procedure into_dumpfile(x char(16), y int)
 begin
   insert into test.t1 values (x, y);
-  select * into dumpfile "../tmp/spdump" from test.t1 limit 1;
+  select * into dumpfile "$MYSQLTEST_VARDIR/tmp/spdump" from test.t1 limit 1;
   insert into test.t1 values (concat(x, "2"), y+2);
 end|
 

mysql-test/t/sp_notembedded.test

@@ -128,6 +128,7 @@ call bug6807()|
 
 drop procedure bug6807|
 
+
 #
 # BUG#10100: function (and stored procedure?) recursivity problem
 #
@@ -152,7 +153,7 @@ create procedure bug10100p(prm int, inout res int)
 begin
   set res = res * prm;
   if prm > 1 then
-    call bug10100p(prm - 1, res);  
+    call bug10100p(prm - 1, res);
   end if;
 end|
 create procedure bug10100t(prm int)

mysql-test/t/subselect.test

@@ -1962,12 +1962,6 @@ insert into t1 values ('1');
 select * from (select max(fld) from t1) as foo;
 drop table t1;
 
-#
-# BUG #10308: purge log with subselect
-#
-
-purge master logs before (select adddate(current_timestamp(), interval -4 day));
-
 #
 # Test for bug #11762: subquery with an aggregate function in HAVING
 #

mysql-test/t/temp_table.test

@@ -1,3 +1,5 @@
+# mysqltest should be fixed
+-- source include/not_embedded.inc
 #
 # Test of temporary tables
 #

mysql-test/t/view_grant.test

@@ -717,3 +717,5 @@ create definer=some_user@`` sql security invoker view v1 as select 1;
 create definer=some_user@localhost sql security invoker view v1 as select 1;
 show create view v1;
 drop view v1;
+
+