Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2327 05/07/07 14:44:28 msvensson@neptunus.(none) +5 -0
BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
sql/sql_show.cc
1.199 05/07/07 14:43:31 msvensson@neptunus.(none) +3 -3
Change TYPE to USING as output from SHOW CREATE TABLE
mysql-test/t/show_check.test
1.43 05/07/07 14:43:31 msvensson@neptunus.(none) +9 -0
Add test for BUG#11635
mysql-test/r/sql_mode.result
1.12 05/07/07 14:43:31 msvensson@neptunus.(none) +3 -3
Update test results
mysql-test/r/show_check.result
1.63 05/07/07 14:43:31 msvensson@neptunus.(none) +20 -5
Update test results
mysql-test/r/ctype_utf8.result
1.58 05/07/07 14:43:31 msvensson@neptunus.(none) +4 -4
Update test results
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/bug11635/my41-bug11635
--- 1.198/sql/sql_show.cc 2005-04-16 21:35:37 +02:00
+++ 1.199/sql/sql_show.cc 2005-07-07 14:43:31 +02:00
@@ -1414,15 +1414,15 @@
!limited_mysql_mode && !foreign_db_mode)
{
if (key_info->algorithm == HA_KEY_ALG_BTREE)
- packet->append(" TYPE BTREE", 11);
+ packet->append(" USING BTREE", 12);
if (key_info->algorithm == HA_KEY_ALG_HASH)
- packet->append(" TYPE HASH", 10);
+ packet->append(" USING HASH", 11);
// +BAR: send USING only in non-default case: non-spatial rtree
if ((key_info->algorithm == HA_KEY_ALG_RTREE) &&
!(key_info->flags & HA_SPATIAL))
- packet->append(" TYPE RTREE", 11);
+ packet->append(" USING RTREE", 12);
// No need to send TYPE FULLTEXT, it is sent as FULLTEXT KEY
}
--- 1.57/mysql-test/r/ctype_utf8.result 2005-06-28 11:59:15 +02:00
+++ 1.58/mysql-test/r/ctype_utf8.result 2005-07-07 14:43:31 +02:00
@@ -412,7 +412,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`c` char(10) character set utf8 default NULL,
- UNIQUE KEY `a` TYPE HASH (`c`(1))
+ UNIQUE KEY `a` USING HASH (`c`(1))
) ENGINE=HEAP DEFAULT CHARSET=latin1
insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
insert into t1 values ('aa');
@@ -448,7 +448,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`c` char(10) character set utf8 default NULL,
- UNIQUE KEY `a` TYPE BTREE (`c`(1))
+ UNIQUE KEY `a` USING BTREE (`c`(1))
) ENGINE=HEAP DEFAULT CHARSET=latin1
insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
insert into t1 values ('aa');
@@ -570,7 +570,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`c` char(10) character set utf8 collate utf8_bin default NULL,
- UNIQUE KEY `a` TYPE HASH (`c`(1))
+ UNIQUE KEY `a` USING HASH (`c`(1))
) ENGINE=HEAP DEFAULT CHARSET=latin1
insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
insert into t1 values ('aa');
@@ -606,7 +606,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`c` char(10) character set utf8 collate utf8_bin default NULL,
- UNIQUE KEY `a` TYPE BTREE (`c`(1))
+ UNIQUE KEY `a` USING BTREE (`c`(1))
) ENGINE=HEAP DEFAULT CHARSET=latin1
insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
insert into t1 values ('aa');
--- 1.11/mysql-test/r/sql_mode.result 2005-06-09 11:38:50 +02:00
+++ 1.12/mysql-test/r/sql_mode.result 2005-07-07 14:43:31 +02:00
@@ -17,7 +17,7 @@
`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 @@
"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 @@
`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';
--- 1.62/mysql-test/r/show_check.result 2005-04-16 21:35:36 +02:00
+++ 1.63/mysql-test/r/show_check.result 2005-07-07 14:43:31 +02:00
@@ -420,7 +420,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL,
- KEY `i` TYPE HASH (`i`)
+ KEY `i` USING HASH (`i`)
) ENGINE=HEAP DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
@@ -428,7 +428,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL,
- KEY `i` TYPE BTREE (`i`)
+ KEY `i` USING BTREE (`i`)
) ENGINE=HEAP DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
@@ -444,7 +444,7 @@
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL,
- KEY `i` TYPE BTREE (`i`)
+ KEY `i` USING BTREE (`i`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
@@ -467,14 +467,14 @@
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL,
- KEY `i` TYPE BTREE (`i`)
+ KEY `i` USING BTREE (`i`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
ALTER TABLE t1 ENGINE=MEMORY;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL,
- KEY `i` TYPE BTREE (`i`)
+ KEY `i` USING BTREE (`i`)
) ENGINE=HEAP DEFAULT CHARSET=latin1
DROP TABLE t1;
CREATE TABLE t1(
@@ -498,3 +498,18 @@
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 field1 A 0 1000 NULL BTREE
drop table t1;
+create table t1 (
+c1 int NOT NULL,
+c2 int NOT NULL,
+PRIMARY KEY USING HASH (c1),
+INDEX USING BTREE(c2)
+);
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `c1` int(11) NOT NULL default '0',
+ `c2` int(11) NOT NULL default '0',
+ PRIMARY KEY USING HASH (`c1`),
+ KEY `c2` USING BTREE (`c2`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
--- 1.42/mysql-test/t/show_check.test 2005-04-16 21:35:37 +02:00
+++ 1.43/mysql-test/t/show_check.test 2005-07-07 14:43:31 +02:00
@@ -368,3 +368,12 @@
--disable_metadata
drop table t1;
+# Test for BUG#11635: mysqldump exports TYPE instead of USING for HASH
+create table t1 (
+ c1 int NOT NULL,
+ c2 int NOT NULL,
+ PRIMARY KEY USING HASH (c1),
+ INDEX USING BTREE(c2)
+);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
| Thread |
|---|
| • bk commit into 4.1 tree (msvensson:1.2327) BUG#11635 | msvensson | 7 Jul |
