bzr commit into mysql-6.0-rpl branch (aelkin:2724)

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/MERGE/2/6.0-rpl/

 2724 Andrei Elkin	2008-11-12 [merge]
      merging (5.1->5.1-rpl) -> 6.1-rpl
modified:
  mysql-test/suite/rpl/r/rpl_locktrans_innodb.result

=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result	2008-07-22 14:16:22 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result	2008-11-12 20:04:19 +0000
@@ -101,12 +101,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	1615	Converted to non-transactional lock on 't2'
+Warning	1621	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	1615	Converted to non-transactional lock on 't1'
+Warning	1621	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
@@ -117,8 +117,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	1615	Converted to non-transactional lock on 't1'
-Warning	1615	Converted to non-transactional lock on 't2'
+Warning	1621	Converted to non-transactional lock on 't1'
+Warning	1621	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;
@@ -142,8 +142,8 @@ ERROR HY000: Cannot convert to non-trans
 ## Error is reported on first table only. Show both errors:
 SHOW WARNINGS;
 Level	Code	Message
-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'
+Error	1622	Cannot convert to non-transactional lock in strict mode on 't1'
+Error	1622	Cannot convert to non-transactional lock in strict mode on 't2'
 UNLOCK TABLES;
 SET @@SQL_MODE= @wl3561_save_sql_mode;
 #
@@ -163,7 +163,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	1615	Converted to non-transactional lock on 't4'
+Warning	1621	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
@@ -180,8 +180,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	1615	Converted to non-transactional lock on 't3'
-Warning	1615	Converted to non-transactional lock on 't4'
+Warning	1621	Converted to non-transactional lock on 't3'
+Warning	1621	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
@@ -197,7 +197,7 @@ COUNT(*)
 ## Report conversion on view due to existing non-transactional locks.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1615	Converted to non-transactional lock on 'v1'
+Warning	1621	Converted to non-transactional lock on 'v1'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);
@@ -206,8 +206,8 @@ UNLOCK TABLES;
 ## Now report conversion on base table again.
 LOCK TABLE v1 IN EXCLUSIVE MODE;
 Warnings:
-Warning	1615	Converted to non-transactional lock on 't3'
-Warning	1615	Converted to non-transactional lock on 't4'
+Warning	1621	Converted to non-transactional lock on 't3'
+Warning	1621	Converted to non-transactional lock on 't4'
 INSERT INTO t3 VALUES(333);
 INSERT INTO t4 VALUES(444);
 INSERT INTO t1 VALUES(111);