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

diff --git a/mysql-test/suite/maria/maria_notembedded.result b/mysql-test/suite/maria/maria_notembedded.result
new file mode 100644
index 00000000..0e90ebce
--- /dev/null
+++ b/mysql-test/suite/maria/maria_notembedded.result
@@ -0,0 +1,71 @@
+call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+set session default_storage_engine=aria;
+create table t1 (a int) row_format=page;
+insert delayed into t1 values(1);
+ERROR HY000: DELAYED option not supported for table 't1'
+drop table t1;
+create table t1 (a int) row_format=page transactional=0;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+a
+1
+select count(*) from t1;
+count(*)
+1
+drop table t1;
+create table t1 (a int) row_format=dynamic;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+a
+1
+select count(*) from t1;
+count(*)
+1
+drop table t1;
+create table t1 (a int unique) transactional=1;
+insert t1 values (1);
+lock table t1 write concurrent;
+insert t1 values (2);
+connect con_a,localhost,root,,;
+lock table t1 write concurrent;
+insert t1 values (3);
+insert t1 values (2);
+connect con_b,localhost,root,,;
+lock table t1 write concurrent;
+insert t1 values (4);
+insert t1 values (3);
+connect con_c,localhost,root,,;
+lock table t1 write concurrent;
+insert t1 values (5);
+insert t1 values (4);
+connect con_d,localhost,root,,;
+lock table t1 write concurrent;
+insert t1 values (6);
+insert t1 values (5);
+connection default;
+insert t1 values (6);
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+unlock tables;
+connection con_a;
+ERROR 23000: Duplicate entry '2' for key 'a'
+unlock tables;
+disconnect con_a;
+connection con_b;
+ERROR 23000: Duplicate entry '3' for key 'a'
+unlock tables;
+disconnect con_b;
+connection con_c;
+ERROR 23000: Duplicate entry '4' for key 'a'
+unlock tables;
+disconnect con_c;
+connection con_d;
+ERROR 23000: Duplicate entry '5' for key 'a'
+unlock tables;
+disconnect con_d;
+connection default;
+check table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+drop table t1;