summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb-deadlock.result
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-24 21:39:22 +0200
committermonty@mashka.mysql.fi <>2002-11-24 21:39:22 +0200
commit7dede8d303b6af108b4813794d2ba9d560fac897 (patch)
tree9b28e48e8d0ca0adf65597e0f97497a4d34c0673 /mysql-test/r/innodb-deadlock.result
parenta976101661c7afdeda2a314e990b4002296e45d6 (diff)
downloadmariadb-git-7dede8d303b6af108b4813794d2ba9d560fac897.tar.gz
Updated results after merge from 3.23
Diffstat (limited to 'mysql-test/r/innodb-deadlock.result')
-rw-r--r--mysql-test/r/innodb-deadlock.result20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/innodb-deadlock.result b/mysql-test/r/innodb-deadlock.result
new file mode 100644
index 00000000000..121bfa8c6cb
--- /dev/null
+++ b/mysql-test/r/innodb-deadlock.result
@@ -0,0 +1,20 @@
+drop table if exists t1;
+create table t1 (id integer, x integer) type=INNODB;
+insert into t1 values(0, 0);
+set autocommit=0;
+SELECT * from t1 where id = 0 FOR UPDATE;
+id x
+0 0
+set autocommit=0;
+update t1 set x=2 where id = 0;
+update t1 set x=1 where id = 0;
+select * from t1;
+id x
+0 1
+commit;
+commit;
+select * from t1;
+id x
+0 2
+commit;
+drop table t1;