bk commit into 5.0 tree (msvensson:1.1895) BUG#11635

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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.1895 05/07/07 15:48:43 msvensson@neptunus.(none) +5 -0
  Manual merge of BUG#11635 whihc is already in 5.0

  sql/sql_show.cc
    1.253 05/07/07 15:48:40 msvensson@neptunus.(none) +0 -3
    Manual merge

  mysql-test/r/sql_mode.result
    1.22 05/07/07 15:48:40 msvensson@neptunus.(none) +2 -5
    Manual merge

  mysql-test/r/show_check.result
    1.69 05/07/07 15:48:40 msvensson@neptunus.(none) +3 -8
    Manual merge

  mysql-test/r/ctype_utf8.result
    1.64 05/07/07 15:48:40 msvensson@neptunus.(none) +4 -8
    Manual merge(without filemerge tool!) 

  mysql-test/t/show_check.test
    1.50 05/07/07 15:40:32 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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/mysql-5.0/RESYNC

--- 1.63/mysql-test/r/ctype_utf8.result	2005-07-03 11:32:01 +02:00
+++ 1.64/mysql-test/r/ctype_utf8.result	2005-07-07 15:48:40 +02:00
@@ -413,7 +413,7 @@
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 default NULL,
   UNIQUE KEY `a` USING HASH (`c`(1))
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
 ERROR 23000: Duplicate entry 'aa' for key 1
@@ -449,7 +449,7 @@
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 default NULL,
   UNIQUE KEY `a` USING BTREE (`c`(1))
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
 ERROR 23000: Duplicate entry 'aa' for key 1
@@ -571,7 +571,7 @@
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 collate utf8_bin default NULL,
   UNIQUE KEY `a` USING HASH (`c`(1))
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
 ERROR 23000: Duplicate entry 'aa' for key 1
@@ -607,7 +607,7 @@
 t1	CREATE TABLE `t1` (
   `c` char(10) character set utf8 collate utf8_bin default NULL,
   UNIQUE KEY `a` USING BTREE (`c`(1))
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');
 ERROR 23000: Duplicate entry 'aa' for key 1

--- 1.21/mysql-test/r/sql_mode.result	2005-07-06 02:05:28 +02:00
+++ 1.22/mysql-test/r/sql_mode.result	2005-07-07 15:48:40 +02:00
@@ -18,7 +18,7 @@
   `email` varchar(60) character set latin2 NOT NULL default '',
   PRIMARY KEY  (`a`),
   UNIQUE KEY `email` USING BTREE (`email`)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="ansi_quotes";
 show variables like 'sql_mode';
 Variable_name	Value
@@ -31,7 +31,7 @@
   "email" varchar(60) character set latin2 NOT NULL default '',
   PRIMARY KEY  ("a"),
   UNIQUE KEY "email" USING BTREE ("email")
-) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+) ENGINE=HEAP DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="no_table_options";
 show variables like 'sql_mode';
 Variable_name	Value

--- 1.68/mysql-test/r/show_check.result	2005-04-18 20:30:17 +02:00
+++ 1.69/mysql-test/r/show_check.result	2005-07-07 15:48:40 +02:00
@@ -420,7 +420,7 @@
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING HASH (`i`)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
@@ -428,7 +428,7 @@
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING BTREE (`i`)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
@@ -474,7 +474,7 @@
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING BTREE (`i`)
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
+) ENGINE=HEAP DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1(
 field1 text NOT NULL,
@@ -497,3 +497,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.49/mysql-test/t/show_check.test	2005-04-17 18:50:17 +02:00
+++ 1.50/mysql-test/t/show_check.test	2005-07-07 15:40:32 +02:00
@@ -376,3 +376,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;