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-no-logging.result b/mysql-test/suite/maria/maria-no-logging.result
new file mode 100644
index 00000000..c510eb4d
--- /dev/null
+++ b/mysql-test/suite/maria/maria-no-logging.result
@@ -0,0 +1,71 @@
+set global aria_log_file_size=4294959104;
+drop database if exists mysqltest;
+create database mysqltest;
+connect  admin, localhost, root,,mysqltest,,;
+connection default;
+use mysqltest;
+set global aria_checkpoint_interval=0;
+create table t2 (a varchar(100)) engine=myisam;
+insert into t2 select repeat('z',100);
+insert into t2 select * from t2;
+insert into t2 select * from t2;
+insert into t2 select * from t2;
+insert into t2 select * from t2;
+insert into t2 select * from t2;
+insert into t2 select * from t2;
+connection default;
+connection admin;
+* shut down mysqld, removed logs, restarted it
+connection default;
+create table t1 (a varchar(100)) engine=aria transactional=1;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(100) DEFAULT NULL
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1
+show engine aria logs;
+Type	Name	Status
+Aria	Size        16384 aria_log.00000001	unknown
+insert into t1 values('a');
+insert into t1 select * from t2;
+show engine aria logs;
+Type	Name	Status
+Aria	Size        24576 aria_log.00000001	unknown
+select count(*) from t1;
+count(*)
+65
+connection default;
+connection admin;
+* shut down mysqld, removed logs, restarted it
+connection default;
+truncate table t1;
+insert into t1 select * from t2;
+show engine aria logs;
+Type	Name	Status
+Aria	Size        16384 aria_log.00000001	unknown
+select count(*) from t1;
+count(*)
+64
+drop table t1;
+connection default;
+connection admin;
+* shut down mysqld, removed logs, restarted it
+connection default;
+create table t1 (a varchar(100)) engine=aria transactional=1;
+insert into t1 values('a');
+create table if not exists t1 select * from t2;
+Warnings:
+Note	1050	Table 't1' already exists
+show engine aria logs;
+Type	Name	Status
+Aria	Size        16384 aria_log.00000001	unknown
+connection default;
+connection admin;
+* shut down mysqld, removed logs, restarted it
+connection default;
+drop table t1;
+create table t1 engine=aria transactional=1 select * from t2;
+show engine aria logs;
+Type	Name	Status
+Aria	Size        16384 aria_log.00000001	unknown
+drop database mysqltest;