Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new

5 files changed, 27 insertions, 24 deletions

diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh
index 7a60464ae91..9ffe61b250a 100755
--- a/BUILD/autorun.sh
+++ b/BUILD/autorun.sh
@@ -3,20 +3,23 @@
 
 die() { echo "$@"; exit 1; }
 
+# Added glibtoolize reference to make native OSX autotools work
+if [ -f /usr/bin/glibtoolize ]
+  then
+    LIBTOOLIZE=glibtoolize
+  else
+    LIBTOOLIZE=libtoolize
+fi
+
 (cd storage/bdb/dist && sh s_all)
 (cd storage/innobase && aclocal && autoheader && \
-    libtoolize --automake --force --copy && \
+    $LIBTOOLIZE --automake --force --copy && \
     automake --force --add-missing --copy && autoconf)
 
 aclocal || die "Can't execute aclocal" 
 autoheader || die "Can't execute autoheader"
 # --force means overwrite ltmain.sh script if it already exists 
-# Added glibtoolize reference to make native OSX autotools work
-if test -f /usr/bin/glibtoolize  ; then
-  glibtoolize --automake --force || die "Can't execute glibtoolize"
-else
-  libtoolize --automake --force || die "Can't execute libtoolize"
-fi
+$LIBTOOLIZE --automake --force || die "Can't execute libtoolize"
   
 # --add-missing instructs automake to install missing auxiliary files
 # and --force to overwrite them if they already exist
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 44f6945238c..1246c6f3d5d 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -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` 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 @@ show create table t1;
 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 @@ 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` 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 @@ 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` 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');
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index 5a2d07db5e6..2c0e8123667 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -556,9 +556,9 @@ t1	CREATE TABLE `t1` (
   `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(*)
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index a8af5c59b81..5dcb8b2afd6 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -460,7 +460,7 @@ SHOW CREATE TABLE t1;
 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 @@ 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 (i int, KEY (i)) ENGINE=MyISAM;
@@ -484,7 +484,7 @@ 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=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
@@ -507,14 +507,14 @@ 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=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 @@ Table	Create Table
 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;
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index 31b67529f8d..3466282a4b1 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -18,7 +18,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` 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 @@ 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" 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 @@ 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` USING BTREE (`email`)
+  UNIQUE KEY `email` (`email`) USING BTREE
 )
 set @@sql_mode="no_key_options";
 show variables like 'sql_mode';