bzr commit into mysql-5.1-bugteam branch (Alexey.Kopytov:2787)

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/mysql-5.1-bugteam/ based on
revid:alexey.kopytov@stripped

 2787 Alexey Kopytov	2009-02-06 [merge]
      Merge from team tree.
modified:
  mysql-test/r/status.result
  mysql-test/suite/funcs_1/r/innodb_trig_09.result
  mysql-test/suite/funcs_1/r/memory_trig_09.result
  mysql-test/suite/funcs_1/r/myisam_trig_09.result
  mysql-test/suite/funcs_1/r/ndb_trig_09.result
  mysql-test/suite/funcs_1/triggers/triggers_09.inc
  mysql-test/suite/parts/inc/partition_auto_increment.inc
  mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
  mysql-test/suite/parts/r/partition_auto_increment_innodb.result
  mysql-test/suite/parts/r/partition_auto_increment_memory.result
  mysql-test/suite/parts/r/partition_auto_increment_myisam.result
  mysql-test/suite/parts/r/partition_auto_increment_ndb.result
  mysql-test/t/status.test

=== modified file 'mysql-test/r/status.result'
--- a/mysql-test/r/status.result	2009-01-23 12:22:05 +0000
+++ b/mysql-test/r/status.result	2009-02-05 16:48:47 +0000
@@ -196,7 +196,7 @@ create table db37908.t1(f1 int);
 insert into db37908.t1 values(1);
 grant usage,execute on test.* to mysqltest_1@localhost;
 create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker 
+create function func37908() returns int sql security invoker
 return (select * from db37908.t1 limit 1)|
 select * from db37908.t1;
 ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'

=== modified file 'mysql-test/suite/funcs_1/r/innodb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_09.result	2009-02-05 13:51:00 +0000
@@ -187,7 +187,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/memory_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/memory_trig_09.result	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/r/memory_trig_09.result	2009-02-05 13:51:00 +0000
@@ -188,7 +188,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/myisam_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_09.result	2009-02-05 13:51:00 +0000
@@ -188,7 +188,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/r/ndb_trig_09.result'
--- a/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_trig_09.result	2009-02-05 13:51:00 +0000
@@ -187,7 +187,8 @@ a	NULL	Test 3.5.9.4	7	999	995.2400000000
 0	0	0	0	0	0
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
-ERROR 23000: Column 'f136' cannot be null
+Warnings:
+Warning	1048	Column 'f136' cannot be null
 Update tb3 Set f122='Test 3.5.9.4-trig', f136=0, f151=DEFAULT, f163=NULL
 where f122='Test 3.5.9.4';
 select f118, f121, f122, f136, f151, f163 from tb3

=== modified file 'mysql-test/suite/funcs_1/triggers/triggers_09.inc'
--- a/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2009-01-31 19:22:59 +0000
+++ b/mysql-test/suite/funcs_1/triggers/triggers_09.inc	2009-02-05 13:51:00 +0000
@@ -183,7 +183,6 @@ let $message= Testcase 3.5.9.4:;
 		@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
 --enable_query_log
 
---error ER_BAD_NULL_ERROR
 	Update tb3 Set f122='Test 3.5.9.4-trig', f136=NULL, f151=DEFAULT, f163=NULL
 		 where f122='Test 3.5.9.4';
 

=== modified file 'mysql-test/suite/parts/inc/partition_auto_increment.inc'
--- a/mysql-test/suite/parts/inc/partition_auto_increment.inc	2008-10-23 20:14:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc	2009-02-05 17:47:24 +0000
@@ -50,12 +50,7 @@ if (!$skip_update)
   UPDATE t1 SET c1 = 40 WHERE c1 = 50;
   SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
   AND TABLE_NAME='t1';
-  -- error 0, ER_BAD_NULL_ERROR
   UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-if (!$mysql_errno)
-{
-  echo # ERROR (only OK if Blackhole) should give ER_DUP_KEY or ER_DUP_ENTRY;
-}
   INSERT INTO t1 VALUES (NULL);
   INSERT INTO t1 VALUES (NULL);
 }
@@ -203,12 +198,7 @@ if (!$skip_update)
   UPDATE t1 SET c1 = 140 WHERE c1 = 150;
   SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test'
   AND TABLE_NAME='t1';
-  -- error 0, ER_BAD_NULL_ERROR
   UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-if (!$mysql_errno)
-{
-  echo # ERROR (only OK if Blackhole) should give ER_DUP_KEY or ER_DUP_ENTRY;
-}
   INSERT INTO t1 VALUES (NULL);
   INSERT INTO t1 VALUES (NULL);
 }

=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_blackhole.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result	2008-11-05
20:13:54 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result	2009-02-05
17:47:24 +0000
@@ -43,7 +43,6 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 1
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-# ERROR (only OK if Blackhole) should give ER_DUP_KEY or ER_DUP_ENTRY
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
@@ -192,7 +191,6 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 1
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
-# ERROR (only OK if Blackhole) should give ER_DUP_KEY or ER_DUP_ENTRY
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;

=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_innodb.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result	2008-11-05 20:13:54
+0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result	2009-02-05 17:47:24
+0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 31
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 10
@@ -215,12 +217,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 141
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 9

=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_memory.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result	2008-11-05 20:13:54
+0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result	2009-02-05 17:47:24
+0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 52
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 152
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 9

=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_myisam.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result	2008-11-05 20:13:54
+0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result	2009-02-05 17:47:24
+0000
@@ -42,12 +42,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 52
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 10
@@ -214,12 +216,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 152
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 9

=== modified file 'mysql-test/suite/parts/r/partition_auto_increment_ndb.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_ndb.result	2008-11-05 20:13:54
+0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_ndb.result	2009-02-05 17:47:24
+0000
@@ -43,12 +43,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 52
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 10
@@ -215,12 +217,14 @@ SELECT AUTO_INCREMENT FROM INFORMATION_S
 AUTO_INCREMENT
 152
 UPDATE t1 SET c1 = NULL WHERE c1 = 4;
+Warnings:
+Warning	1048	Column 'c1' cannot be null
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
 c1
+0
 2
-4
 5
 6
 9

=== modified file 'mysql-test/t/status.test'
--- a/mysql-test/t/status.test	2009-01-23 12:22:05 +0000
+++ b/mysql-test/t/status.test	2009-02-05 16:48:47 +0000
@@ -4,6 +4,9 @@
 # embedded server causes different stat
 -- source include/not_embedded.inc
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 # Disable concurrent inserts to avoid sporadic test failures as it might
 # affect the the value of variables used throughout the test case.
 set @old_concurrent_insert= @@global.concurrent_insert;
@@ -88,7 +91,7 @@ show status like 'last_query_cost';
 drop table t1;
 
 #
-# Test for Bug #15933 max_used_connections is wrong after FLUSH STATUS
+# Test for Bug#15933 max_used_connections is wrong after FLUSH STATUS
 # if connections are cached
 #
 #
@@ -188,7 +191,7 @@ disconnect con1;
 
 
 #
-# Bug #30377: EXPLAIN loses last_query_cost when used with UNION
+# Bug#30377 EXPLAIN loses last_query_cost when used with UNION
 #
 
 CREATE TABLE t1 ( a INT );
@@ -241,7 +244,7 @@ eval select substring_index('$rnd_next2'
 disconnect con1;
 connection default;
 
-# 
+#
 # Bug#30252 Com_create_function is not incremented.
 #
 flush status;
@@ -261,7 +264,7 @@ drop function f1;
 show status like 'Com%function';
 
 #
-# Bug#37908: Skipped access right check caused server crash.
+# Bug#37908 Skipped access right check caused server crash.
 #
 connect (root, localhost, root,,test);
 connection root;
@@ -273,20 +276,20 @@ insert into db37908.t1 values(1);
 grant usage,execute on test.* to mysqltest_1@localhost;
 delimiter |;
 create procedure proc37908() begin select 1; end |
-create function func37908() returns int sql security invoker 
+create function func37908() returns int sql security invoker
   return (select * from db37908.t1 limit 1)|
 delimiter ;|
-  
+
 connect (user1,localhost,mysqltest_1,,test);
 connection user1;
 
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 select * from db37908.t1;
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t1);
---error 1142
+--error ER_TABLEACCESS_DENIED_ERROR
 show function status where name ='func37908' and 1 in (select func37908());
 
 connection default;
@@ -297,6 +300,8 @@ drop procedure proc37908;
 drop function func37908;
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
 DROP USER mysqltest_1@localhost;
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
 
 #
 # Bug#41131 "Questions" fails to increment - ignores statements instead stored procs
@@ -339,3 +344,7 @@ DROP FUNCTION f1;
 # Restore global concurrent_insert value. Keep in the end of the test file.
 --connection default
 set @@global.concurrent_insert= @old_concurrent_insert;
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
+