List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:June 4 2008 8:40am
Subject:bzr commit into mysql-6.0 branch (mattiasj:2665) Bug#31210
View as plain text  
#At file:///Users/mattiasj/clones/bzrroot/b31210-60-bugteam/

 2665 Mattias Jonsson	2008-06-04
      Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
      
      Update of results files after new error code introduced in 5.1
modified:
  mysql-test/r/locktrans_innodb.result
  mysql-test/r/locktrans_myisam.result
  mysql-test/suite/rpl/r/rpl_heartbeat.result
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
  mysql-test/suite/rpl/r/rpl_locktrans_myisam.result

per-file messages:
  mysql-test/r/locktrans_innodb.result
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Update of results files after new error code introduced in 5.1
  mysql-test/r/locktrans_myisam.result
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Update of results files after new error code introduced in 5.1
  mysql-test/suite/rpl/r/rpl_heartbeat.result
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Update of results files after new error code introduced in 5.1
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Update of results files after new error code introduced in 5.1
  mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Update of results files after new error code introduced in 5.1
=== modified file 'mysql-test/r/locktrans_innodb.result'
--- a/mysql-test/r/locktrans_innodb.result	2008-05-21 19:44:56 +0000
+++ b/mysql-test/r/locktrans_innodb.result	2008-06-04 08:40:49 +0000
@@ -94,12 +94,12 @@ ERROR 42000: You have an error in your S
 # Implicit lock method conversion due to mix in statement.
 LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.
 LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.
 INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -110,8 +110,8 @@ INSERT INTO t2 SELECT * FROM t1;
 # Lock t1 exclusive (converted to write), t2 share (converted to read).
 LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;
 INSERT INTO t2 SELECT * FROM t1;
@@ -135,8 +135,8 @@ ERROR HY000: Cannot convert to non-trans
 ## Error is reported on first table only. Show both errors:
 SHOW WARNINGS;
 Level	Code	Message
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't2'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -156,7 +156,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
 # Request a transactional lock, which is converted to non-transactional.
 LOCK TABLE t4 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.
 INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -173,8 +173,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
 # Request a share lock on the view, which is converted to read locks.
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;
 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -190,7 +190,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -199,8 +199,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);

=== modified file 'mysql-test/r/locktrans_myisam.result'
--- a/mysql-test/r/locktrans_myisam.result	2008-05-21 19:44:56 +0000
+++ b/mysql-test/r/locktrans_myisam.result	2008-06-04 08:40:49 +0000
@@ -21,8 +21,8 @@ UNLOCK TABLES;
 # Valid syntax for transactional locks.
 LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 #
 # Valid syntax for aliases with and without 'AS'.
@@ -30,19 +30,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;
 UNLOCK TABLES;
 LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'a1'
-Warning	1614	Converted to non-transactional lock on 'a2'
+Warning	1615	Converted to non-transactional lock on 'a1'
+Warning	1615	Converted to non-transactional lock on 'a2'
 UNLOCK TABLES;
 #
 # Transactional locks taken on a view.
 CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 DROP VIEW v1;
 #
 # Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -94,12 +94,12 @@ ERROR 42000: You have an error in your S
 # Implicit lock method conversion due to mix in statement.
 LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.
 LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.
 INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -110,8 +110,8 @@ INSERT INTO t2 SELECT * FROM t1;
 # Lock t1 exclusive (converted to write), t2 share (converted to read).
 LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;
 INSERT INTO t2 SELECT * FROM t1;
@@ -135,8 +135,8 @@ ERROR HY000: Cannot convert to non-trans
 ## Error is reported on first table only. Show both errors:
 SHOW WARNINGS;
 Level	Code	Message
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't2'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -156,7 +156,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
 # Request a transactional lock, which is converted to non-transactional.
 LOCK TABLE t4 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.
 INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -173,8 +173,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
 # Request a share lock on the view, which is converted to read locks.
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;
 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -190,7 +190,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -199,8 +199,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-05-21 19:44:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2008-06-04 08:40:49 +0000
@@ -11,13 +11,13 @@ Variable_name	Slave_heartbeat_period
 Value	5.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
 Warnings:
-Warning	1670	The requested value for the heartbeat period  is less than 1 msec.  The period is reset to zero which means no heartbeats will be sending
+Warning	1671	The requested value for the heartbeat period  is less than 1 msec.  The period is reset to zero which means no heartbeats will be sending
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.000
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
 Warnings:
-Warning	1670	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+Warning	1671	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	4294967.000
@@ -29,7 +29,7 @@ reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
 Warnings:
-Warning	1670	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+Warning	1671	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	5.001
@@ -41,7 +41,7 @@ Variable_name	Slave_heartbeat_period
 Value	4.000
 set @@global.slave_net_timeout= 3 /* must be a warning */;
 Warnings:
-Warning	1670	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+Warning	1671	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
 reset slave;
 drop table if exists t1;
 set @@global.slave_net_timeout= 10;

=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result	2008-05-21 19:44:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result	2008-06-04 08:40:49 +0000
@@ -100,12 +100,12 @@ ERROR 42000: You have an error in your S
 # Implicit lock method conversion due to mix in statement.
 LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.
 LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.
 INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -116,8 +116,8 @@ INSERT INTO t2 SELECT * FROM t1;
 # Lock t1 exclusive (converted to write), t2 share (converted to read).
 LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;
 INSERT INTO t2 SELECT * FROM t1;
@@ -141,8 +141,8 @@ ERROR HY000: Cannot convert to non-trans
 ## Error is reported on first table only. Show both errors:
 SHOW WARNINGS;
 Level	Code	Message
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't2'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -162,7 +162,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
 # Request a transactional lock, which is converted to non-transactional.
 LOCK TABLE t4 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.
 INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -179,8 +179,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
 # Request a share lock on the view, which is converted to read locks.
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;
 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -196,7 +196,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -205,8 +205,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);

=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result	2008-05-21 19:44:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result	2008-06-04 08:40:49 +0000
@@ -27,8 +27,8 @@ UNLOCK TABLES;
 # Valid syntax for transactional locks.
 LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 #
 # Valid syntax for aliases with and without 'AS'.
@@ -36,19 +36,19 @@ LOCK TABLE t1 AS a1 READ, t2 a2 WRITE;
 UNLOCK TABLES;
 LOCK TABLE t1 AS a1 IN SHARE MODE, t2 a2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'a1'
-Warning	1614	Converted to non-transactional lock on 'a2'
+Warning	1615	Converted to non-transactional lock on 'a1'
+Warning	1615	Converted to non-transactional lock on 'a2'
 UNLOCK TABLES;
 #
 # Transactional locks taken on a view.
 CREATE VIEW v1 AS SELECT * FROM t1, t2 WHERE t1.c1 = t2.c2;
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 DROP VIEW v1;
 #
 # Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -100,12 +100,12 @@ ERROR 42000: You have an error in your S
 # Implicit lock method conversion due to mix in statement.
 LOCK TABLE t1 READ, t2 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't2'
 UNLOCK TABLES;
 # Lock t1 share (converted to read), t2 write.
 LOCK TABLE t1 IN SHARE MODE, t2 WRITE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't1'
 # Show t1 is read locked, t2 write locked.
 INSERT INTO t1 SELECT * FROM t2;
 ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
@@ -116,8 +116,8 @@ INSERT INTO t2 SELECT * FROM t1;
 # Lock t1 exclusive (converted to write), t2 share (converted to read).
 LOCK TABLE t1 IN EXCLUSIVE MODE, t2 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't1'
-Warning	1614	Converted to non-transactional lock on 't2'
+Warning	1615	Converted to non-transactional lock on 't1'
+Warning	1615	Converted to non-transactional lock on 't2'
 # Show t1 is write locked, t2 read locked.
 INSERT INTO t1 SELECT * FROM t2;
 INSERT INTO t2 SELECT * FROM t1;
@@ -141,8 +141,8 @@ ERROR HY000: Cannot convert to non-trans
 ## Error is reported on first table only. Show both errors:
 SHOW WARNINGS;
 Level	Code	Message
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't1'
-Error	1615	Cannot convert to non-transactional lock in strict mode on 't2'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1616	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -162,7 +162,7 @@ CREATE TABLE t4 (c4 INT) ENGINE= MyISAM;
 # Request a transactional lock, which is converted to non-transactional.
 LOCK TABLE t4 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Try a conflict with the existing non-transactional lock.
 INSERT INTO t4 VALUES(444);
 ERROR HY000: Table 't4' was locked with a READ lock and can't be updated
@@ -179,8 +179,8 @@ CREATE VIEW v1 AS SELECT * FROM t3, t4 W
 # Request a share lock on the view, which is converted to read locks.
 LOCK TABLE v1 IN SHARE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 # Show that read locks on the base tables prohibit writing ...
 INSERT INTO t3 SELECT * FROM t4;
 ERROR HY000: Table 't3' was locked with a READ lock and can't be updated
@@ -196,7 +196,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 'v1'
+Warning	1615	Converted to non-transactional lock on 'v1'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -205,8 +205,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1614	Converted to non-transactional lock on 't3'
-Warning	1614	Converted to non-transactional lock on 't4'
+Warning	1615	Converted to non-transactional lock on 't3'
+Warning	1615	Converted to non-transactional lock on 't4'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);

Thread
bzr commit into mysql-6.0 branch (mattiasj:2665) Bug#31210Mattias Jonsson4 Jun