summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-05-15 00:31:32 +0300
committermonty@narttu.mysql.fi <>2003-05-15 00:31:32 +0300
commitc935709140d2d30a73dd773d8a0a1e28341707ab (patch)
treef7863d8877b3a084fc924054dac84bfcf6414230 /mysql-test
parentda0e28b7d6f7a1f1c26c22327a2217ee2a23c82d (diff)
parent04004534eaef1f7854258a91ecc492d4f16357b4 (diff)
downloadmariadb-git-c935709140d2d30a73dd773d8a0a1e28341707ab.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/create.result4
-rw-r--r--mysql-test/r/type_blob.result2
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index f6f917b44b0..76e749ab6e7 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -23,7 +23,7 @@ Warnings:
Note 1051 Unknown table 't1'
Note 1051 Unknown table 't2'
create table t1 (b char(0) not null, index(b));
-The used table handler can't index column 'b'
+The used storage engine can't index column 'b'
create table t1 (a int not null auto_increment,primary key (a)) type=heap;
create table t1 (a int not null,b text) type=heap;
The used table type doesn't support BLOB/TEXT columns
@@ -269,6 +269,8 @@ SELECT @@table_type;
@@table_type
GEMINI
CREATE TABLE t1 (a int not null);
+Warnings:
+Warning 1259 Using storage engine MYISAM for table 't1'
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index 62fe54ba217..6d1b1189185 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -347,7 +347,7 @@ a 1
hello 1
drop table t1;
create table t1 (a text, key (a(300)));
-Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the table handler doesn't support unique sub keys
+Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the store engine doesn't support unique sub keys
create table t1 (a text, key (a(255)));
drop table t1;
CREATE TABLE t1 (