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

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

1 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/main/rollback.test b/mysql-test/main/rollback.test
new file mode 100644
index 00000000..3b8ad901
--- /dev/null
+++ b/mysql-test/main/rollback.test
@@ -0,0 +1,25 @@
+#
+# This test should fail as MyISAM doesn't have rollback
+#
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+# PS doesn't work with BEGIN ... ROLLBACK
+--disable_ps_protocol
+
+create table t1 (n int not null primary key) engine=myisam;
+begin work;
+insert into t1 values (4);
+insert into t1 values (5);
+rollback;
+select @@warning_count;
+select @@error_count;
+show warnings;
+show errors;
+select * from t1;
+select @@warning_count;
+show warnings;
+drop table t1;
+
+# End of 4.1 tests