Below is the list of changes that have just been committed into a local
6.0 repository of msvensson. When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-14 18:58:43+02:00, msvensson@stripped +7 -0
Bug#36062 error code 1612 changed to 1669 in 6.0
mysql-test/r/binlog_index.result@stripped, 2008-04-14 18:58:39+02:00, msvensson@stripped +2 -2
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
mysql-test/r/locktrans_innodb.result@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +12 -12
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
mysql-test/r/locktrans_myisam.result@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +19 -19
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +4 -4
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +12 -12
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +19 -19
Fix result files after move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
sql/share/errmsg.txt@stripped, 2008-04-14 18:58:40+02:00, msvensson@stripped +2 -2
Move ER_LOG_PURGE_NO_FILE to the right place in errmsg.txt
diff -Nrup a/mysql-test/r/binlog_index.result b/mysql-test/r/binlog_index.result
--- a/mysql-test/r/binlog_index.result 2008-04-03 15:37:55 +02:00
+++ b/mysql-test/r/binlog_index.result 2008-04-14 18:58:39 +02:00
@@ -9,7 +9,7 @@ master-bin.000003 #
master-bin.000004 #
purge binary logs TO 'master-bin.000004';
Warnings:
-Warning 1669 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
+Warning 1612 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
*** must show a list starting from the 'TO' argument of PURGE ***
show binary logs;
Log_name File_size
@@ -20,7 +20,7 @@ flush logs;
flush logs;
*** must be a warning master-bin.000001 was not found ***
Warnings:
-Warning 1669 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
+Warning 1612 Being purged log MYSQLTEST_VARDIR/log/master-bin.000001 was not found
*** must show one record, of the active binlog, left in the index file after PURGE ***
show binary logs;
Log_name File_size
diff -Nrup a/mysql-test/r/locktrans_innodb.result b/mysql-test/r/locktrans_innodb.result
--- a/mysql-test/r/locktrans_innodb.result 2008-04-03 15:37:56 +02:00
+++ b/mysql-test/r/locktrans_innodb.result 2008-04-14 18:58:40 +02:00
@@ -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 1612 Converted to non-transactional lock on 't2'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1613 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1613 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1614 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1614 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 1612 Converted to non-transactional lock on 't4'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 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 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/r/locktrans_myisam.result b/mysql-test/r/locktrans_myisam.result
--- a/mysql-test/r/locktrans_myisam.result 2008-04-03 15:37:56 +02:00
+++ b/mysql-test/r/locktrans_myisam.result 2008-04-14 18:58:40 +02:00
@@ -21,8 +21,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 'a1'
-Warning 1612 Converted to non-transactional lock on 'a2'
+Warning 1613 Converted to non-transactional lock on 'a1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't2'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1613 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1613 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1614 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1614 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 1612 Converted to non-transactional lock on 't4'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 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 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-04-02 20:56:04 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result 2008-04-14 18:58:40 +02:00
@@ -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 1668 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 1669 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 1668 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 1669 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 1668 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 1669 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 1668 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 1669 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;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-04-02 20:56:04 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2008-04-14 18:58:40 +02:00
@@ -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 1612 Converted to non-transactional lock on 't2'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1613 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1613 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1614 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1614 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 1612 Converted to non-transactional lock on 't4'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 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 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-04-02 20:56:05 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2008-04-14 18:58:40 +02:00
@@ -27,8 +27,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 'a1'
-Warning 1612 Converted to non-transactional lock on 'a2'
+Warning 1613 Converted to non-transactional lock on 'a1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't2'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't1'
-Warning 1612 Converted to non-transactional lock on 't2'
+Warning 1613 Converted to non-transactional lock on 't1'
+Warning 1613 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 1613 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1613 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1614 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1614 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 1612 Converted to non-transactional lock on 't4'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 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 1612 Converted to non-transactional lock on 'v1'
+Warning 1613 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 1612 Converted to non-transactional lock on 't3'
-Warning 1612 Converted to non-transactional lock on 't4'
+Warning 1613 Converted to non-transactional lock on 't3'
+Warning 1613 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt 2008-04-02 20:48:16 +02:00
+++ b/sql/share/errmsg.txt 2008-04-14 18:58:40 +02:00
@@ -6123,6 +6123,8 @@ ER_SLAVE_CORRUPT_EVENT
eng "Corrupted replication event was detected"
ER_LOAD_DATA_INVALID_COLUMN
eng "Invalid column reference (%-.64s) in LOAD DATA"
+ER_LOG_PURGE_NO_FILE
+ eng "Being purged log %s was not found"
ER_WARN_AUTO_CONVERT_LOCK
eng "Converted to non-transactional lock on '%-.64s'"
ger "Umgewandelt zu nicht-transaktionalen Sperren auf '%-.64s'"
@@ -6250,5 +6252,3 @@ ER_SLAVE_HEARTBEAT_FAILURE
eng "Unexpected master's heartbeat data: %s"
ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
eng "The requested value for the heartbeat period %s %s"
-ER_LOG_PURGE_NO_FILE
- eng "Being purged log %s was not found"
| Thread |
|---|
| • bk commit into 6.0 tree (msvensson:1.2626) BUG#36062 | msvensson | 14 Apr |
