summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2017-07-18 13:51:12 +0300
committerElena Stepanova <elenst@montyprogram.com>2017-07-18 13:51:12 +0300
commitd1af417eb87e244f635c0c076d47f3ed383e8380 (patch)
tree8875a84dabe9344d3fa29df5427e5463f020d4e9
parent442a6f61f544b317696e1937d5b74a76aceb55df (diff)
downloadmariadb-git-d1af417eb87e244f635c0c076d47f3ed383e8380.tar.gz
Postfix for MDEV-12619 - test results adjusted
-rw-r--r--mysql-test/suite/storage_engine/create_table.result2
-rw-r--r--storage/myisammrg/mysql-test/storage_engine/create_table.rdiff2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/storage_engine/create_table.result b/mysql-test/suite/storage_engine/create_table.result
index 6936854eb65..2ca144fe50c 100644
--- a/mysql-test/suite/storage_engine/create_table.result
+++ b/mysql-test/suite/storage_engine/create_table.result
@@ -27,7 +27,7 @@ CREATE TABLE t1 ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> AS SELECT 1 UNION
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `1` bigint(20) NOT NULL DEFAULT 0
+ `1` int(1) NOT NULL DEFAULT 0
) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
SELECT * FROM t1;
1
diff --git a/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff
index 4c98e62625a..ad6352d3e7b 100644
--- a/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff
+++ b/storage/myisammrg/mysql-test/storage_engine/create_table.rdiff
@@ -29,7 +29,7 @@
-SHOW CREATE TABLE t1;
-Table Create Table
-t1 CREATE TABLE `t1` (
-- `1` bigint(20) NOT NULL DEFAULT 0
+- `1` int(1) NOT NULL DEFAULT 0
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
-SELECT * FROM t1;
-1