summaryrefslogtreecommitdiff
path: root/mysql-test/r/heap.result
diff options
context:
space:
mode:
authorAshish Agarwal <ashish.y.agarwal@oracle.com>2011-09-27 17:44:31 +0530
committerAshish Agarwal <ashish.y.agarwal@oracle.com>2011-09-27 17:44:31 +0530
commit236886d754b039610c2e500e53e417e464e8faaa (patch)
treef5bd691382ef6bdba1495329896320f0c9c56c38 /mysql-test/r/heap.result
parent9cc04425278c6aa9ba7930ce1eb907e47d35a399 (diff)
parent5dbcff9b9c86dc9608252d270b6ebff7a6066040 (diff)
downloadmariadb-git-236886d754b039610c2e500e53e417e464e8faaa.tar.gz
Bug#11759349 -- Merge of patch from mysql-5.1.
Diffstat (limited to 'mysql-test/r/heap.result')
-rw-r--r--mysql-test/r/heap.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index 05ddccfed0a..1cabb91d1b0 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -715,8 +715,8 @@ create table t1 (c char(10)) engine=memory;
create table t2 (c varchar(10)) engine=memory;
show table status like 't_';
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t1 MEMORY 10 Fixed 0 11 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
-t2 MEMORY 10 Fixed 0 12 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
+t1 MEMORY 10 Fixed 0 11 0 # 0 0 NULL # NULL NULL latin1_swedish_ci NULL
+t2 MEMORY 10 Fixed 0 12 0 # 0 0 NULL # NULL NULL latin1_swedish_ci NULL
drop table t1, t2;
CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),
KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;