bzr push into mysql-6.0-bugteam branch (gshchepa:3023 to 3024) Bug#39265

[Gleb Shchepa]

 3024 Gleb Shchepa	2009-02-06
      after-push test case update (bug #39265)
modified:
  mysql-test/suite/falcon/r/ps_8falcon.result

 3023 Gleb Shchepa	2009-02-05 [merge]
      manual merge 5.1-bugteam --> 6.0-bugteam
modified:
  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_falcon.result
  mysql-test/suite/parts/r/partition_auto_increment_innodb.result
  mysql-test/suite/parts/r/partition_auto_increment_maria.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

=== modified file 'mysql-test/suite/falcon/r/ps_8falcon.result'
--- a/mysql-test/suite/falcon/r/ps_8falcon.result	2008-09-19 09:12:48 +0000
+++ b/mysql-test/suite/falcon/r/ps_8falcon.result	2009-02-06 06:11:22 +0000
@@ -1286,11 +1286,12 @@ a	b
 set @arg00=NULL;
 set @arg01=2;
 execute stmt1 using @arg00, @arg01;
-ERROR 23000: Column 'a' cannot be null
+Warnings:
+Warning	1048	Column 'a' cannot be null
 select a,b from t1 order by a;
 a	b
+0	two
 1	one
-2	two
 3	three
 4	four
 set @arg00=0;