bk commit into 5.1 tree (serg:1.2395)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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.2395 06/05/09 11:14:31 serg@stripped +4 -0
  results fixed

  mysql-test/r/sql_mode.result
    1.38 06/05/09 11:13:37 serg@stripped +3 -3
    results fixed

  mysql-test/r/show_check.result
    1.94 06/05/09 11:13:32 serg@stripped +7 -7
    results fixed

  mysql-test/r/heap.result
    1.49 06/05/09 11:13:31 serg@stripped +3 -3
    results fixed

  mysql-test/r/ctype_utf8.result
    1.89 06/05/09 11:13:26 serg@stripped +4 -4
    results fixed

# 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:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.88/mysql-test/r/ctype_utf8.result	Sat Apr  1 02:38:27 2006
+++ 1.89/mysql-test/r/ctype_utf8.result	Tue May  9 11:13:26 2006
@@ -412,7 +412,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c` char(10) CHARACTER SET utf8 DEFAULT NULL,
-  UNIQUE KEY `a` USING HASH (`c`(1))
+  UNIQUE KEY `a` (`c`(1)) USING HASH
 ) ENGINE=MEMORY 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` USING BTREE (`c`(1))
+  UNIQUE KEY `a` (`c`(1)) USING BTREE
 ) ENGINE=MEMORY 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` USING HASH (`c`(1))
+  UNIQUE KEY `a` (`c`(1)) USING HASH
 ) ENGINE=MEMORY 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` USING BTREE (`c`(1))
+  UNIQUE KEY `a` (`c`(1)) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
 insert into t1 values ('aa');

--- 1.37/mysql-test/r/sql_mode.result	Thu Mar  9 12:37:52 2006
+++ 1.38/mysql-test/r/sql_mode.result	Tue May  9 11:13:37 2006
@@ -18,7 +18,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` USING BTREE (`email`)
+  UNIQUE KEY `email` (`email`) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="ansi_quotes";
 show variables like 'sql_mode';
@@ -31,7 +31,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" USING BTREE ("email")
+  UNIQUE KEY "email" ("email") USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 set @@sql_mode="no_table_options";
 show variables like 'sql_mode';
@@ -44,7 +44,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` USING BTREE (`email`)
+  UNIQUE KEY `email` (`email`) USING BTREE
 )
 set @@sql_mode="no_key_options";
 show variables like 'sql_mode';

--- 1.48/mysql-test/r/heap.result	Tue Mar  7 14:00:40 2006
+++ 1.49/mysql-test/r/heap.result	Tue May  9 11:13:31 2006
@@ -556,9 +556,9 @@
   `v` varchar(10) DEFAULT NULL,
   `c` char(10) DEFAULT NULL,
   `t` varchar(50) DEFAULT NULL,
-  KEY `v` USING BTREE (`v`),
-  KEY `c` USING BTREE (`c`),
-  KEY `t` USING BTREE (`t`(10))
+  KEY `v` (`v`) USING BTREE,
+  KEY `c` (`c`) USING BTREE,
+  KEY `t` (`t`(10)) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 select count(*) from t1;
 count(*)

--- 1.93/mysql-test/r/show_check.result	Mon Mar  6 05:35:33 2006
+++ 1.94/mysql-test/r/show_check.result	Tue May  9 11:13:32 2006
@@ -460,7 +460,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
-  KEY `i` USING HASH (`i`)
+  KEY `i` (`i`) USING HASH
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
@@ -468,7 +468,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
-  KEY `i` USING BTREE (`i`)
+  KEY `i` (`i`) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
@@ -484,7 +484,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
-  KEY `i` USING BTREE (`i`)
+  KEY `i` (`i`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
@@ -507,14 +507,14 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) DEFAULT NULL,
-  KEY `i` USING BTREE (`i`)
+  KEY `i` (`i`) USING BTREE
 ) 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` USING BTREE (`i`)
+  KEY `i` (`i`) USING BTREE
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1(
@@ -549,8 +549,8 @@
 t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
-  PRIMARY KEY USING HASH (`c1`),
-  KEY `c2` USING BTREE (`c2`)
+  PRIMARY KEY (`c1`) USING HASH,
+  KEY `c2` (`c2`) USING BTREE
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 flush tables;