diff options
| author | unknown <jimw@mysql.com> | 2005-01-08 22:22:41 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-08 22:22:41 +0100 |
| commit | f2034fdbbad36254837e3363f801480fb4ba5315 (patch) | |
| tree | 38eb3b93c139e14e91f34864fc0ab462beaad1f5 /mysql-test/r/sql_mode.result | |
| parent | 5802259dc5ca818c53332b360dba09570f4f6e81 (diff) | |
| parent | 895b50d74c772eac555faa69521c3a976a85d1e9 (diff) | |
| download | mariadb-git-f2034fdbbad36254837e3363f801480fb4ba5315.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-7233
into mysql.com:/home/jwinstead2/mysql-5.0-clean
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/sql_mode.result')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 6 |
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'; |