summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-07-12 22:54:49 +0400
committerAlexander Barkov <bar@mariadb.org>2017-07-12 22:54:49 +0400
commitdaec0004502a1f8c2ff7d46de92a61b5c4da1d6c (patch)
tree4b74130669a2558980be4ede5a2b3144c9f6fcd4 /storage/myisammrg
parent0f348bcd965cd47784634508da2202aba2dc0547 (diff)
parent1d730ac42d58b5364690634260f915daea659259 (diff)
downloadmariadb-git-daec0004502a1f8c2ff7d46de92a61b5c4da1d6c.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
index 22e3447e00a..9ba985f7adc 100644
--- a/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/parts/truncate_table.rdiff
@@ -27,7 +27,7 @@
- `c` char(8) DEFAULT NULL,
- PRIMARY KEY (`a`)
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
-PARTITIONS 2
-INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
-SHOW CREATE TABLE t1;
@@ -37,7 +37,7 @@
- `c` char(8) DEFAULT NULL,
- PRIMARY KEY (`a`)
-) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=4 DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
-PARTITIONS 2
-TRUNCATE TABLE t1;
-SHOW CREATE TABLE t1;
@@ -47,7 +47,7 @@
- `c` char(8) DEFAULT NULL,
- PRIMARY KEY (`a`)
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
-PARTITIONS 2
-INSERT INTO t1 (c) VALUES ('d');
-SHOW CREATE TABLE t1;
@@ -57,7 +57,7 @@
- `c` char(8) DEFAULT NULL,
- PRIMARY KEY (`a`)
-) ENGINE=<STORAGE_ENGINE> AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
-- PARTITION BY HASH (a)
+- PARTITION BY HASH (`a`)
-PARTITIONS 2
-SELECT a,c FROM t1;
-a c