summaryrefslogtreecommitdiff
path: root/mysql-test/r/sql_mode.result
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-01-08 22:22:41 +0100
committerjimw@mysql.com <>2005-01-08 22:22:41 +0100
commite959e0b8fcaae7a7829520977f2bbc944520ae20 (patch)
tree38eb3b93c139e14e91f34864fc0ab462beaad1f5 /mysql-test/r/sql_mode.result
parent8d6f8446413798d96de57587d1cfcc2518b69b65 (diff)
parent5c497ef3a85c1b0ae3d6155656c6446aeb5b77a3 (diff)
downloadmariadb-git-e959e0b8fcaae7a7829520977f2bbc944520ae20.tar.gz
Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean
Diffstat (limited to 'mysql-test/r/sql_mode.result')
-rw-r--r--mysql-test/r/sql_mode.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index fea99086303..e01355816c3 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -17,7 +17,7 @@ t1 CREATE TABLE `t1` (
`pseudo` varchar(35) character set latin2 NOT NULL default '',
`email` varchar(60) character set latin2 NOT NULL default '',
PRIMARY KEY (`a`),
- UNIQUE KEY `email` TYPE BTREE (`email`)
+ UNIQUE KEY `email` USING BTREE (`email`)
) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
set @@sql_mode="ansi_quotes";
show variables like 'sql_mode';
@@ -30,7 +30,7 @@ t1 CREATE TABLE "t1" (
"pseudo" varchar(35) character set latin2 NOT NULL default '',
"email" varchar(60) character set latin2 NOT NULL default '',
PRIMARY KEY ("a"),
- UNIQUE KEY "email" TYPE BTREE ("email")
+ UNIQUE KEY "email" USING BTREE ("email")
) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
set @@sql_mode="no_table_options";
show variables like 'sql_mode';
@@ -43,7 +43,7 @@ t1 CREATE TABLE `t1` (
`pseudo` varchar(35) character set latin2 NOT NULL default '',
`email` varchar(60) character set latin2 NOT NULL default '',
PRIMARY KEY (`a`),
- UNIQUE KEY `email` TYPE BTREE (`email`)
+ UNIQUE KEY `email` USING BTREE (`email`)
)
set @@sql_mode="no_key_options";
show variables like 'sql_mode';