summaryrefslogtreecommitdiff
path: root/mysql-test/r/lock_multi.result
diff options
context:
space:
mode:
authorGleb Shchepa <gshchepa@mysql.com>2008-10-08 02:52:49 +0500
committerGleb Shchepa <gshchepa@mysql.com>2008-10-08 02:52:49 +0500
commit39996b44cce1cb40fe3ae0634c735626c3a103e0 (patch)
tree0410f91fd4242a83c6223b770ea87e32d5e28c00 /mysql-test/r/lock_multi.result
parent5898c53c549aa794b14a3769a21878b50729de1f (diff)
parentf48b42e77657dd2e27380201631fd0f137863b85 (diff)
downloadmariadb-git-39996b44cce1cb40fe3ae0634c735626c3a103e0.tar.gz
manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
Diffstat (limited to 'mysql-test/r/lock_multi.result')
-rw-r--r--mysql-test/r/lock_multi.result16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result
index cd05fc1473f..088f09801e9 100644
--- a/mysql-test/r/lock_multi.result
+++ b/mysql-test/r/lock_multi.result
@@ -96,6 +96,22 @@ alter table t1 auto_increment=0;
alter table t1 auto_increment=0;
unlock tables;
drop table t1;
+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
+# PS mode
+DROP TABLE t1, t2, t3;
End of 5.0 tests
create table t1 (i int);
lock table t1 read;