#At file:///home/uchum/work/bzr/mysql-pe/ based on revid:davi.arnaut@strippedbh31gz451vll
3497 Gleb Shchepa 2009-07-31
Fix of incorrect errmsg*.txt merge (bug #18828).
modified:
mysql-test/r/debug_sync.result
mysql-test/r/func_str.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/signal.result
mysql-test/r/signal_demo3.result
mysql-test/suite/rpl/r/rpl_locktrans_innodb.result
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
sql/share/errmsg-utf8.txt
sql/share/errmsg.txt
=== modified file 'mysql-test/r/debug_sync.result'
--- a/mysql-test/r/debug_sync.result 2009-06-12 02:01:08 +0000
+++ b/mysql-test/r/debug_sync.result 2009-07-31 16:46:36 +0000
@@ -146,7 +146,7 @@ Variable_name Value
debug_sync ON - current signal: 'something'
SET DEBUG_SYNC= 'now WAIT_FOR nothing TIMEOUT 0';
Warnings:
-Warning 1741 debug sync point wait timed out
+Warning 1742 debug sync point wait timed out
SET DEBUG_SYNC= 'now SIGNAL nothing';
SHOW VARIABLES LIKE 'DEBUG_SYNC';
Variable_name Value
=== modified file 'mysql-test/r/func_str.result'
--- a/mysql-test/r/func_str.result 2009-07-02 08:19:17 +0000
+++ b/mysql-test/r/func_str.result 2009-07-31 16:46:36 +0000
@@ -2560,7 +2560,7 @@ SELECT format(12345678901234567890.123,
format(12345678901234567890.123, 3, NULL)
12,345,678,901,234,567,890.123
Warnings:
-Warning 1790 Unknown locale: 'NULL'
+Warning 1791 Unknown locale: 'NULL'
SELECT format(12345678901234567890.123, 3, 'ar_AE');
format(12345678901234567890.123, 3, 'ar_AE')
12,345,678,901,234,567,890.123
@@ -2680,5 +2680,5 @@ SELECT format(123, 1, 'Non-existent-loca
format(123, 1, 'Non-existent-locale')
123.0
Warnings:
-Warning 1790 Unknown locale: 'Non-existent-locale'
+Warning 1791 Unknown locale: 'Non-existent-locale'
End of 5.4 tests
=== modified file 'mysql-test/r/locktrans_innodb.result'
--- a/mysql-test/r/locktrans_innodb.result 2009-06-04 14:08:54 +0000
+++ b/mysql-test/r/locktrans_innodb.result 2009-07-31 16:46:36 +0000
@@ -95,12 +95,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 1637 Converted to non-transactional lock on 't2'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
+Warning 1638 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
@@ -111,8 +111,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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 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;
@@ -136,8 +136,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -157,7 +157,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 1637 Converted to non-transactional lock on 't4'
+Warning 1638 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
@@ -174,8 +174,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 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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
@@ -191,7 +191,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -200,8 +200,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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 2009-06-04 14:08:54 +0000
+++ b/mysql-test/r/locktrans_myisam.result 2009-07-31 16:46:36 +0000
@@ -21,8 +21,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 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 1637 Converted to non-transactional lock on 'a1'
-Warning 1637 Converted to non-transactional lock on 'a2'
+Warning 1638 Converted to non-transactional lock on 'a1'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 Converted to non-transactional lock on 'v1'
UNLOCK TABLES;
DROP VIEW v1;
#
@@ -95,12 +95,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 1637 Converted to non-transactional lock on 't2'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
+Warning 1638 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
@@ -111,8 +111,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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 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;
@@ -136,8 +136,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -157,7 +157,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 1637 Converted to non-transactional lock on 't4'
+Warning 1638 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
@@ -174,8 +174,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 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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
@@ -191,7 +191,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -200,8 +200,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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/signal.result'
--- a/mysql-test/r/signal.result 2009-07-03 05:54:09 +0000
+++ b/mysql-test/r/signal.result 2009-07-31 16:46:36 +0000
@@ -580,7 +580,7 @@ SIGNAL foo;
ERROR 42000: Undefined CONDITION: foo
SIGNAL SQLSTATE '01000';
Warnings:
-Warning 1778 Unhandled user-defined warning condition
+Warning 1779 Unhandled user-defined warning condition
SIGNAL SQLSTATE '02000';
ERROR 02000: Unhandled user-defined not found condition
SIGNAL SQLSTATE '23000';
@@ -694,7 +694,7 @@ SIGNAL warn;
end $$
call test_signal() $$
Warnings:
-Warning 1778 Unhandled user-defined warning condition
+Warning 1779 Unhandled user-defined warning condition
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -704,7 +704,7 @@ SIGNAL warn;
end $$
call test_signal() $$
Warnings:
-Warning 1778 Unhandled user-defined warning condition
+Warning 1779 Unhandled user-defined warning condition
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -853,7 +853,7 @@ SIGNAL warn SET MESSAGE_TEXT = "Somethin
end $$
call test_signal() $$
Warnings:
-Warning 1778 Something bad happened
+Warning 1779 Something bad happened
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -878,7 +878,7 @@ SIGNAL something SET MESSAGE_TEXT = _utf
end $$
call test_signal() $$
Warnings:
-Warning 1778 This is a UTF8 text
+Warning 1779 This is a UTF8 text
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -887,7 +887,7 @@ SIGNAL something SET MESSAGE_TEXT = "";
end $$
call test_signal() $$
Warnings:
-Warning 1778
+Warning 1779
drop procedure test_signal $$
create procedure test_signal()
begin
@@ -896,10 +896,10 @@ SIGNAL warn SET MESSAGE_TEXT = "�� a";
end $$
call test_signal() $$
Warnings:
-Warning 1778 �� a
+Warning 1779 �� a
show warnings $$
Level Code Message
-Warning 1778 �� a
+Warning 1779 �� a
drop procedure test_signal $$
#
# Test SET complex expressions
@@ -1162,17 +1162,17 @@ MYSQL_ERRNO = 10000;
end $$
call test_signal() $$
Warnings:
-Warning 1783 Data truncated for condition item 'CLASS_ORIGIN'
-Warning 1783 Data truncated for condition item 'SUBCLASS_ORIGIN'
-Warning 1783 Data truncated for condition item 'CONSTRAINT_CATALOG'
-Warning 1783 Data truncated for condition item 'CONSTRAINT_SCHEMA'
-Warning 1783 Data truncated for condition item 'CONSTRAINT_NAME'
-Warning 1783 Data truncated for condition item 'CATALOG_NAME'
-Warning 1783 Data truncated for condition item 'SCHEMA_NAME'
-Warning 1783 Data truncated for condition item 'TABLE_NAME'
-Warning 1783 Data truncated for condition item 'COLUMN_NAME'
-Warning 1783 Data truncated for condition item 'CURSOR_NAME'
-Warning 1783 Data truncated for condition item 'MESSAGE_TEXT'
+Warning 1784 Data truncated for condition item 'CLASS_ORIGIN'
+Warning 1784 Data truncated for condition item 'SUBCLASS_ORIGIN'
+Warning 1784 Data truncated for condition item 'CONSTRAINT_CATALOG'
+Warning 1784 Data truncated for condition item 'CONSTRAINT_SCHEMA'
+Warning 1784 Data truncated for condition item 'CONSTRAINT_NAME'
+Warning 1784 Data truncated for condition item 'CATALOG_NAME'
+Warning 1784 Data truncated for condition item 'SCHEMA_NAME'
+Warning 1784 Data truncated for condition item 'TABLE_NAME'
+Warning 1784 Data truncated for condition item 'COLUMN_NAME'
+Warning 1784 Data truncated for condition item 'CURSOR_NAME'
+Warning 1784 Data truncated for condition item 'MESSAGE_TEXT'
Warning 10000 11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112222222222222222222288888888
drop procedure test_signal $$
create procedure test_signal()
=== modified file 'mysql-test/r/signal_demo3.result'
--- a/mysql-test/r/signal_demo3.result 2009-06-04 14:28:56 +0000
+++ b/mysql-test/r/signal_demo3.result 2009-07-31 16:46:36 +0000
@@ -78,15 +78,15 @@ ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
Error 1051 Unknown table 'oops_it_is_not_here'
-Error 1780 Oops in proc_9
-Error 1780 Oops in proc_8
-Error 1780 Oops in proc_7
-Error 1780 Oops in proc_6
-Error 1780 Oops in proc_5
-Error 1780 Oops in proc_4
-Error 1780 Oops in proc_3
-Error 1780 Oops in proc_2
-Error 1780 Oops in proc_1
+Error 1781 Oops in proc_9
+Error 1781 Oops in proc_8
+Error 1781 Oops in proc_7
+Error 1781 Oops in proc_6
+Error 1781 Oops in proc_5
+Error 1781 Oops in proc_4
+Error 1781 Oops in proc_3
+Error 1781 Oops in proc_2
+Error 1781 Oops in proc_1
SET @@session.max_error_count = 5;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -95,11 +95,11 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1780 Oops in proc_5
-Error 1780 Oops in proc_4
-Error 1780 Oops in proc_3
-Error 1780 Oops in proc_2
-Error 1780 Oops in proc_1
+Error 1781 Oops in proc_5
+Error 1781 Oops in proc_4
+Error 1781 Oops in proc_3
+Error 1781 Oops in proc_2
+Error 1781 Oops in proc_1
SET @@session.max_error_count = 7;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -108,13 +108,13 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1780 Oops in proc_7
-Error 1780 Oops in proc_6
-Error 1780 Oops in proc_5
-Error 1780 Oops in proc_4
-Error 1780 Oops in proc_3
-Error 1780 Oops in proc_2
-Error 1780 Oops in proc_1
+Error 1781 Oops in proc_7
+Error 1781 Oops in proc_6
+Error 1781 Oops in proc_5
+Error 1781 Oops in proc_4
+Error 1781 Oops in proc_3
+Error 1781 Oops in proc_2
+Error 1781 Oops in proc_1
SET @@session.max_error_count = 9;
SELECT @@session.max_error_count;
@@session.max_error_count
@@ -123,15 +123,15 @@ call proc_1();
ERROR 45000: Oops in proc_1
show warnings;
Level Code Message
-Error 1780 Oops in proc_9
-Error 1780 Oops in proc_8
-Error 1780 Oops in proc_7
-Error 1780 Oops in proc_6
-Error 1780 Oops in proc_5
-Error 1780 Oops in proc_4
-Error 1780 Oops in proc_3
-Error 1780 Oops in proc_2
-Error 1780 Oops in proc_1
+Error 1781 Oops in proc_9
+Error 1781 Oops in proc_8
+Error 1781 Oops in proc_7
+Error 1781 Oops in proc_6
+Error 1781 Oops in proc_5
+Error 1781 Oops in proc_4
+Error 1781 Oops in proc_3
+Error 1781 Oops in proc_2
+Error 1781 Oops in proc_1
drop database demo;
SET @@global.max_error_count = @start_global_value;
SELECT @@global.max_error_count;
=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2009-06-04 14:08:54 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_innodb.result 2009-07-31 16:46:36 +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 1637 Converted to non-transactional lock on 't2'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 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 1638 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1639 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 1637 Converted to non-transactional lock on 't4'
+Warning 1638 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 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 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 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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 2009-06-08 14:58:33 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result 2009-07-31 16:46:36 +0000
@@ -68,8 +68,8 @@ UNLOCK TABLES;
# Valid syntax for transactional locks.
LOCK TABLE t1 IN SHARE MODE, t2 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 Converted to non-transactional lock on 't2'
UNLOCK TABLES;
#
# Valid syntax for aliases with and without 'AS'.
@@ -77,19 +77,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 1637 Converted to non-transactional lock on 'a1'
-Warning 1637 Converted to non-transactional lock on 'a2'
+Warning 1638 Converted to non-transactional lock on 'a1'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 Converted to non-transactional lock on 'v1'
UNLOCK TABLES;
DROP VIEW v1;
#
@@ -142,12 +142,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 1637 Converted to non-transactional lock on 't2'
+Warning 1638 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 1637 Converted to non-transactional lock on 't1'
+Warning 1638 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
@@ -158,8 +158,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 1637 Converted to non-transactional lock on 't1'
-Warning 1637 Converted to non-transactional lock on 't2'
+Warning 1638 Converted to non-transactional lock on 't1'
+Warning 1638 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;
@@ -183,8 +183,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1638 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1639 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -204,7 +204,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 1637 Converted to non-transactional lock on 't4'
+Warning 1638 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
@@ -221,8 +221,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 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 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
@@ -238,7 +238,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 'v1'
+Warning 1638 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -247,8 +247,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1637 Converted to non-transactional lock on 't3'
-Warning 1637 Converted to non-transactional lock on 't4'
+Warning 1638 Converted to non-transactional lock on 't3'
+Warning 1638 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt 2009-07-24 12:37:26 +0000
+++ b/sql/share/errmsg-utf8.txt 2009-07-31 16:46:36 +0000
@@ -6196,6 +6196,9 @@ ER_RENAMED_NAME
eng "Renamed"
swe "Namn��ndrad"
+ER_TOO_MANY_CONCURRENT_TRXS
+ eng "Too many active concurrent transactions"
+
ER_WARN_AUTO_CONVERT_LOCK
eng "Converted to non-transactional lock on '%-.64s'"
ger "Umgewandelt zu nicht-transaktionalen Sperren auf '%-.64s'"
@@ -6550,5 +6553,3 @@ ER_BACKUP_ACCESS_DENIED_ERROR
eng "Insufficient privileges. You must have the BACKUP privilege to backup database '%s'."
ER_RESTORE_ACCESS_DENIED_ERROR
eng "Insufficient privileges. You must have the RESTORE privilege to restore database '%s'."
-ER_TOO_MANY_CONCURRENT_TRXS
- eng "Too many active concurrent transactions"
=== modified file 'sql/share/errmsg.txt'
--- a/sql/share/errmsg.txt 2009-07-24 12:37:26 +0000
+++ b/sql/share/errmsg.txt 2009-07-31 16:46:36 +0000
@@ -6196,6 +6196,9 @@ ER_RENAMED_NAME
eng "Renamed"
swe "Namn�ndrad"
+ER_TOO_MANY_CONCURRENT_TRXS
+ eng "Too many active concurrent transactions"
+
ER_WARN_AUTO_CONVERT_LOCK
eng "Converted to non-transactional lock on '%-.64s'"
ger "Umgewandelt zu nicht-transaktionalen Sperren auf '%-.64s'"
@@ -6550,5 +6553,3 @@ ER_BACKUP_ACCESS_DENIED_ERROR
eng "Insufficient privileges. You must have the BACKUP privilege to backup database '%s'."
ER_RESTORE_ACCESS_DENIED_ERROR
eng "Insufficient privileges. You must have the RESTORE privilege to restore database '%s'."
-ER_TOO_MANY_CONCURRENT_TRXS
- eng "Too many active concurrent transactions"
Attachment: [text/bzr-bundle] bzr/gshchepa@mysql.com-20090731164636-4d3zv78q8ab8fvru.bundle
| Thread |
|---|
| • bzr commit into mysql-pe branch (gshchepa:3497) Bug#18828 | Gleb Shchepa | 31 Jul |
