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, 33 insertions, 0 deletions

diff --git a/mysql-test/main/lock_multi_bug38499.result b/mysql-test/main/lock_multi_bug38499.result
new file mode 100644
index 00000000..521ea010
--- /dev/null
+++ b/mysql-test/main/lock_multi_bug38499.result
@@ -0,0 +1,33 @@
+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;
+CREATE TABLE t1( a INT, b INT );
+CREATE TABLE t2( a INT, b INT );
+INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4);
+INSERT INTO t2 VALUES (1, 1), (2, 2), (3, 3), (4, 4);
+# 1. test regular tables
+# 1.1. test altering of columns that multiupdate doesn't use
+# 1.1.1. normal mode
+# 1.1.2. PS mode
+# 1.2. test altering of columns that multiupdate uses
+# 1.2.1. normal mode
+connection default;
+# 1.2.2. PS mode
+connection default;
+ALTER TABLE t1 ADD COLUMN a INT;
+# 2. test UNIONs
+# 2.1. test altering of columns that multiupdate doesn't use
+# 2.1.1. normal mode
+# 2.1.2. PS mode
+# 2.2. test altering of columns that multiupdate uses
+# 2.2.1. normal mode
+connection default;
+# 2.2.2. PS mode
+connection default;
+DROP TABLE t1,t2;
+disconnect locker;
+disconnect writer;
+SET @@global.sync_frm = @odl_sync_frm;