Commit fb8e271a authored by unknown's avatar unknown
Browse files

Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 

into mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 16a43296 a28f221f

mysql-test/r/ctype_utf8.result

+2 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 default NULL,

  UNIQUE KEY `a` (`c`(1))

  UNIQUE KEY `a` TYPE HASH (`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 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) character set utf8 collate utf8_bin default NULL,

  UNIQUE KEY `a` (`c`(1))

  UNIQUE KEY `a` TYPE HASH (`c`(1))

) ENGINE=HEAP DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

mysql-test/r/show_check.result

+70 −0
Original line number Diff line number Diff line
@@ -405,3 +405,73 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; 
delete from mysql.db   

where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

flush privileges;

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` TYPE HASH (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` TYPE BTREE (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` (`i`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` TYPE BTREE (`i`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` (`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` (`i`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL,

  KEY `i` TYPE 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`)

) ENGINE=HEAP DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/t/show_check.test

+32 −0
Original line number Diff line number Diff line
@@ -321,3 +321,35 @@ flush privileges; 
#--replace_column 7 # 8 # 9 #

#show table status from `` LIKE '';

#drop database ``;



# Test that USING <keytype> is always shown in SHOW CREATE TABLE when it was

# specified during table creation, but not otherwise. (Bug #7235)

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;

SHOW CREATE TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

DROP TABLE t1;

# Test that when an index is created with the default key algorithm and

# altered to another storage engine, it gets the default key algorithm

# for that storage engine, but when it is specified, the specified type is

# preserved.

CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

ALTER TABLE t1 ENGINE=MEMORY;

SHOW CREATE TABLE t1;

DROP TABLE t1;

CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;

SHOW CREATE TABLE t1;

ALTER TABLE t1 ENGINE=MEMORY;

SHOW CREATE TABLE t1;

DROP TABLE t1;

sql/sql_show.cc

+6 −2
Original line number Diff line number Diff line
@@ -1404,14 +1404,18 @@ store_create_info(THD *thd, TABLE *table, String *packet) 
    if (!(thd->variables.sql_mode & MODE_NO_KEY_OPTIONS) &&

	!limited_mysql_mode && !foreign_db_mode)

    {

      if (table->db_type == DB_TYPE_HEAP &&

	  key_info->algorithm == HA_KEY_ALG_BTREE)

      if (key_info->algorithm == HA_KEY_ALG_BTREE)

	packet->append(" TYPE BTREE", 11);

      

      if (key_info->algorithm == HA_KEY_ALG_HASH)

	packet->append(" TYPE HASH", 10);

      

      // +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);



      // No need to send TYPE FULLTEXT, it is sent as FULLTEXT KEY

    }

    packet->append(" (", 2);