Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 0 deletions

diff --git a/mysql-test/main/lock_multi_bug38691.result b/mysql-test/main/lock_multi_bug38691.result
new file mode 100644
index 00000000..55836e16
--- /dev/null
+++ b/mysql-test/main/lock_multi_bug38691.result
@@ -0,0 +1,27 @@
+SET @odl_sync_frm = @@global.sync_frm;
+SET @@global.sync_frm = OFF;
+connect  locker,localhost,root,,;
+connect  writer,localhost,root,,;
+connection default;
+DROP TABLE IF EXISTS t1,t2,t3;
+CREATE TABLE t1 (
+a int(11) unsigned default NULL,
+b varchar(255) default NULL,
+UNIQUE KEY a (a),
+KEY b (b)
+);
+INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3);
+CREATE TABLE t2 SELECT * FROM t1;
+CREATE TABLE t3 SELECT * FROM t1;
+# test altering of columns that multiupdate doesn't use
+# normal mode
+# PS mode
+# test altering of columns that multiupdate uses
+# normal mode
+connection default;
+# PS mode
+connection default;
+DROP TABLE t1, t2, t3;
+disconnect locker;
+disconnect writer;
+SET @@global.sync_frm = @odl_sync_frm;