Below is the list of changes that have just been committed into a local
5.2 repository of istruewing. When istruewing 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, 2007-05-29 15:14:03+02:00, istruewing@stripped +6 -0
post-merge fix
mysql-test/include/locktrans.inc@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +1 -1
post-merge fix
mysql-test/r/locktrans_innodb.result@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +13 -13
post-merge fix
mysql-test/r/locktrans_myisam.result@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +19 -19
post-merge fix
mysql-test/r/rpl_locktrans_innodb.result@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +14 -13
post-merge fix
mysql-test/r/rpl_locktrans_myisam.result@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +20 -19
post-merge fix
sql/sql_parse.cc@stripped, 2007-05-29 15:13:59+02:00, istruewing@stripped +2 -0
fixed a build failure in embedded server
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: istruewing
# Host: chilla.local
# Root: /home/mydev/mysql-5.2-axmrg
--- 1.670/sql/sql_parse.cc 2007-05-29 15:14:12 +02:00
+++ 1.671/sql/sql_parse.cc 2007-05-29 15:14:12 +02:00
@@ -4744,9 +4744,11 @@ check_table_access(THD *thd, ulong want_
goto deny;
}
thd->security_ctx= backup_ctx;
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
if (grant_option)
return check_grant(thd,want_access & ~EXTRA_ACL,org_tables,
test(want_access & EXTRA_ACL), UINT_MAX, no_errors);
+#endif
return FALSE;
deny:
thd->security_ctx= backup_ctx;
--- 1.2/mysql-test/include/locktrans.inc 2007-05-29 15:14:12 +02:00
+++ 1.3/mysql-test/include/locktrans.inc 2007-05-29 15:14:12 +02:00
@@ -912,7 +912,7 @@ BEGIN
END//
DELIMITER ;//
--echo # Create a view with t1 and the function.
-CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1;
+CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1 GROUP BY 2;
--echo # Take an exclusive lock on v1.
--echo # This pre-locks t2 through the view.
LOCK TABLE v1 IN EXCLUSIVE MODE;
--- 1.2/mysql-test/r/locktrans_innodb.result 2007-05-29 15:14:13 +02:00
+++ 1.3/mysql-test/r/locktrans_innodb.result 2007-05-29 15:14:13 +02:00
@@ -93,12 +93,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 1584 Converted to non-transactional lock on 't2'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
+Warning 1588 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
@@ -109,8 +109,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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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;
@@ -134,8 +134,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -155,7 +155,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 1584 Converted to non-transactional lock on 't4'
+Warning 1588 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
@@ -172,8 +172,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 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 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
@@ -189,7 +189,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -794,7 +794,7 @@ BEGIN
RETURN (SELECT COUNT(*) FROM t2);
END//
# Create a view with t1 and the function.
-CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1;
+CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1 GROUP BY 2;
# Take an exclusive lock on v1.
# This pre-locks t2 through the view.
LOCK TABLE v1 IN EXCLUSIVE MODE;
--- 1.1/mysql-test/r/locktrans_myisam.result 2007-05-29 15:14:13 +02:00
+++ 1.2/mysql-test/r/locktrans_myisam.result 2007-05-29 15:14:13 +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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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 1584 Converted to non-transactional lock on 'a1'
-Warning 1584 Converted to non-transactional lock on 'a2'
+Warning 1588 Converted to non-transactional lock on 'a1'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -93,12 +93,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 1584 Converted to non-transactional lock on 't2'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
+Warning 1588 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
@@ -109,8 +109,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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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;
@@ -134,8 +134,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -155,7 +155,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 1584 Converted to non-transactional lock on 't4'
+Warning 1588 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
@@ -172,8 +172,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 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 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
@@ -189,7 +189,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -198,8 +198,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
--- 1.1/mysql-test/r/rpl_locktrans_innodb.result 2007-05-29 15:14:13 +02:00
+++ 1.2/mysql-test/r/rpl_locktrans_innodb.result 2007-05-29 15:14:13 +02:00
@@ -99,12 +99,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 1584 Converted to non-transactional lock on 't2'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
+Warning 1588 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
@@ -115,8 +115,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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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;
@@ -140,8 +140,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -161,7 +161,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 1584 Converted to non-transactional lock on 't4'
+Warning 1588 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
@@ -178,8 +178,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 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 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
@@ -195,7 +195,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -800,7 +800,7 @@ BEGIN
RETURN (SELECT COUNT(*) FROM t2);
END//
# Create a view with t1 and the function.
-CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1;
+CREATE VIEW v1 AS SELECT COUNT(*), count_t2() FROM t1 GROUP BY 2;
# Take an exclusive lock on v1.
# This pre-locks t2 through the view.
LOCK TABLE v1 IN EXCLUSIVE MODE;
@@ -962,3 +962,4 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
+Master_SSL_Verify_Server_Cert No
--- 1.1/mysql-test/r/rpl_locktrans_myisam.result 2007-05-29 15:14:13 +02:00
+++ 1.2/mysql-test/r/rpl_locktrans_myisam.result 2007-05-29 15:14:13 +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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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 1584 Converted to non-transactional lock on 'a1'
-Warning 1584 Converted to non-transactional lock on 'a2'
+Warning 1588 Converted to non-transactional lock on 'a1'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 Converted to non-transactional lock on 't2'
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
DROP VIEW v1;
#
# Locking INFORMATION_SCHEMA fails on missing privileges.
@@ -99,12 +99,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 1584 Converted to non-transactional lock on 't2'
+Warning 1588 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 1584 Converted to non-transactional lock on 't1'
+Warning 1588 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
@@ -115,8 +115,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 1584 Converted to non-transactional lock on 't1'
-Warning 1584 Converted to non-transactional lock on 't2'
+Warning 1588 Converted to non-transactional lock on 't1'
+Warning 1588 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;
@@ -140,8 +140,8 @@ ERROR HY000: Cannot convert to non-trans
## Error is reported on first table only. Show both errors:
SHOW WARNINGS;
Level Code Message
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't1'
-Error 1585 Cannot convert to non-transactional lock in strict mode on 't2'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't1'
+Error 1589 Cannot convert to non-transactional lock in strict mode on 't2'
UNLOCK TABLES;
SET @@SQL_MODE= @wl3561_save_sql_mode;
#
@@ -161,7 +161,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 1584 Converted to non-transactional lock on 't4'
+Warning 1588 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
@@ -178,8 +178,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 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 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
@@ -195,7 +195,7 @@ COUNT(*)
## Report conversion on view due to existing non-transactional locks.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 'v1'
+Warning 1588 Converted to non-transactional lock on 'v1'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -204,8 +204,8 @@ UNLOCK TABLES;
## Now report conversion on base table again.
LOCK TABLE v1 IN EXCLUSIVE MODE;
Warnings:
-Warning 1584 Converted to non-transactional lock on 't3'
-Warning 1584 Converted to non-transactional lock on 't4'
+Warning 1588 Converted to non-transactional lock on 't3'
+Warning 1588 Converted to non-transactional lock on 't4'
INSERT INTO t3 VALUES(333);
INSERT INTO t4 VALUES(444);
INSERT INTO t1 VALUES(111);
@@ -434,3 +434,4 @@ Master_SSL_Cert
Master_SSL_Cipher
Master_SSL_Key
Seconds_Behind_Master #
+Master_SSL_Verify_Server_Cert No
| Thread |
|---|
| • bk commit into 5.2 tree (istruewing:1.2517) | ingo | 29 May |
