Commit f2034fdb authored by unknown's avatar unknown
Browse files

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
parents 5802259d 895b50d7

mysql-test/r/ctype_utf8.result

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ show create table t1; 
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');
@@ -606,7 +606,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` 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');

mysql-test/r/show_check.result

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ select @@max_heap_table_size; 
1047552

CREATE TABLE t1 (

a int(11) default NULL,

KEY a TYPE BTREE (a)

KEY a USING BTREE (a)

) ENGINE=HEAP;

CREATE TABLE t2 (

b int(11) default NULL,
@@ -307,7 +307,7 @@ index(b) 
CREATE TABLE t3 (

a int(11) default NULL,

b int(11) default NULL,

KEY a TYPE BTREE (a),

KEY a USING BTREE (a),

index(b)

) ENGINE=HEAP;

insert into t1 values (1),(2);

mysql-test/r/sql_mode.result

+3 −3
Original line number Diff line number Diff line
@@ -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';

mysql-test/t/show_check.test

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ select @@max_heap_table_size; 


CREATE TABLE t1 (

 a int(11) default NULL,

 KEY a TYPE BTREE (a)

 KEY a USING BTREE (a)

) ENGINE=HEAP;



CREATE TABLE t2 (
@@ -230,7 +230,7 @@ CREATE TABLE t2 ( 
CREATE TABLE t3 (

 a int(11) default NULL,

 b int(11) default NULL,

 KEY a TYPE BTREE (a),

 KEY a USING BTREE (a),

 index(b)

) ENGINE=HEAP;

sql/sql_show.cc

+2 −2
Original line number Diff line number Diff line
@@ -889,12 +889,12 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet) 
    {

      if (share->db_type == DB_TYPE_HEAP &&

	  key_info->algorithm == HA_KEY_ALG_BTREE)

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

	packet->append(" USING BTREE", 12);

      

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

    }

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