Merge bk-internal.mysql.com:/home/bk/mysql-5.0

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

7 files changed, 32 insertions, 12 deletions

diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 4e99b0c4b8b..162db3d0c0a 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -566,6 +566,22 @@ drop table t1;
 
 --warning 1364
 create table t1 ( 
+  a varchar(12) charset utf8 collate utf8_bin not null, 
+  b int not null, primary key (a)
+) select a, 1 as c from t2 ;
+show create table t1;
+drop table t1;
+
+--warning 1364
+create table t1 ( 
+  a varchar(12) charset utf8 collate utf8_bin not null, 
+  b int null, primary key (a)
+) select a, 1 as c from t2 ;
+show create table t1;
+drop table t1;
+
+--warning 1364
+create table t1 ( 
   a varchar(12) charset utf8 collate utf8_bin not null,
   b int not null, primary key (a)
 ) select 'a' as a , 1 as b from t2 ;
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 0e7eabbed6d..a209088f202 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,6 +11,5 @@
 ##############################################################################
 
 sp-goto         : GOTO is currently is disabled - will be fixed in the future
-kill            : Unstable test case, bug#9712
 subselect       : Bug#15706
 type_time       : Bug#15805
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index f3e14c3cd2b..3fb09df5f2f 100644
--- a/mysql-test/t/handler.test
+++ b/mysql-test/t/handler.test
@@ -3,7 +3,7 @@
 #
 
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1,t3,t4,t5;
 --enable_warnings
 
 create table t1 (a int, b char(10), key a(a), key b(a,b));
diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test
index 7f3a9932d31..c50c35825fc 100644
--- a/mysql-test/t/kill.test
+++ b/mysql-test/t/kill.test
@@ -25,11 +25,18 @@ select ((@id := kill_id) - kill_id) from t1;
 kill @id;
 
 connection con1;
---sleep 1
+--sleep 2
 
-# this statement should fail
---error 2006,2013
+--disable_query_log
+--disable_result_log
+# One of the following statements should fail
+--error 0,2006,2013
 select 1;
+--error 0,2006,2013
+select 1;
+--enable_query_log
+--enable_result_log
+
 --enable_reconnect
 # this should work, and we should have a new connection_id()
 select ((@id := kill_id) - kill_id) from t1;
diff --git a/mysql-test/t/mysqlshow.test b/mysql-test/t/mysqlshow.test
index 1e2e97a4e07..78c4ae2b531 100644
--- a/mysql-test/t/mysqlshow.test
+++ b/mysql-test/t/mysqlshow.test
@@ -2,7 +2,7 @@
 -- source include/not_embedded.inc
 
 --disable_warnings
-DROP TABLE IF EXISTS t1,t2;
+DROP TABLE IF EXISTS t1,t2,test1,test2;
 --enable_warnings
 
 #
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index b4074897689..f2d9bb6c856 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -930,11 +930,8 @@ drop table t1, t2, t3;
 # operator.
 #
 create table t1 (a int);
---disable_warnings
-drop procedure if exists p2;
---enable_warnings
 DELIMITER //;
-CREATE PROCEDURE `p2`()
+CREATE PROCEDURE `p1`()
 begin
   insert into t1 values (1);
 end//
@@ -944,8 +941,8 @@ begin
   set done= not done;
 end//
 DELIMITER ;//
-CALL p2();
-drop procedure p2;
+CALL p1();
+drop procedure p1;
 drop table t1;
 
 #
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 718e1a9932b..db6c12fdacb 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -2275,6 +2275,7 @@ drop table t1;
 #
 create table t1(f1 int, f2 int);
 insert into t1 values (null, 10), (null,2);
+select f1, sum(f2) from t1 group by f1;
 create view v1 as select * from t1;
 select f1, sum(f2) from v1 group by f1;
 drop view v1;