List:Commits« Previous MessageNext Message »
From:Gleb Shchepa Date:February 5 2009 6:57pm
Subject:bzr commit into mysql-6.0-bugteam branch (gshchepa:3023)
View as plain text  
#At file:///work/bzr/mysql-6.0-bugteam/ based on revid:matthias.leich@stripped

 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/parts/inc/partition_auto_increment.inc'
--- a/mysql-test/suite/parts/inc/partition_auto_increment.inc	2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc	2009-02-05 17:57:15 +0000
@@ -51,13 +51,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_BAD_NULL_ERROR;
-  echo # mysql_errno: $mysql_errno;
-}
   INSERT INTO t1 VALUES (NULL);
   INSERT INTO t1 VALUES (NULL);
 }
@@ -207,13 +201,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_BAD_NULL_ERROR;
-  echo # mysql_errno: $mysql_errno;
-}
   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-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result	2009-02-05 17:57:15 +0000
@@ -44,8 +44,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_BAD_NULL_ERROR
-# mysql_errno: 0
 INSERT INTO t1 VALUES (NULL);
 INSERT INTO t1 VALUES (NULL);
 SELECT * FROM t1 ORDER BY c1;
@@ -196,8 +194,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_BAD_NULL_ERROR
-# mysql_errno: 0
 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_falcon.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_falcon.result	2008-11-07 16:31:51 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_falcon.result	2009-02-05 17:57:15 +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_innodb.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result	2008-11-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result	2009-02-05 17:57:15 +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_maria.result'
--- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result	2008-11-21 14:21:50 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result	2009-02-05 17:57:15 +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_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-06 06:18:15 +0000
+++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result	2009-02-05 17:57:15 +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
Thread
• bzr commit into mysql-6.0-bugteam branch (gshchepa:3023)Gleb Shchepa5 Feb