Commit 41aae79f authored by unknown's avatar unknown
Browse files

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

into mysql.com:/M51/mysql-5.1
parents f3b20f58 fb2477b3

BUILD/autorun.sh

+12 −7
Original line number Diff line number Diff line
@@ -3,18 +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 && aclocal && automake && autoconf)

(cd storage/innobase && aclocal && autoheader && \

    $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

BUILD/compile-dist

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ 
#

make distclean

(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)

aclocal

autoheader

libtoolize --automake --force --copy

mysql-test/r/ctype_utf8.result

+4 −4
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` 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');

mysql-test/r/distinct.result

+12 −0
Original line number Diff line number Diff line
@@ -533,3 +533,15 @@ select count(distinct concat(x,y)) from t1; 
count(distinct concat(x,y))

2

drop table t1;

CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a,b));

INSERT INTO t1 VALUES (1, 101);

INSERT INTO t1 SELECT a + 1, a + 101 FROM t1;

INSERT INTO t1 SELECT a + 2, a + 102 FROM t1;

INSERT INTO t1 SELECT a + 4, a + 104 FROM t1;

INSERT INTO t1 SELECT a + 8, a + 108 FROM t1;

EXPLAIN SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	8	NULL	16	Using where; Using index

SELECT DISTINCT a,a FROM t1 WHERE b < 12 ORDER BY a;

a	a

DROP TABLE t1;

mysql-test/r/group_min_max.result

+22 −0
Original line number Diff line number Diff line
@@ -2116,3 +2116,25 @@ COUNT(DISTINCT a) 
1

DROP TABLE t1;

DROP PROCEDURE a;

CREATE TABLE t1 (a varchar(64) NOT NULL default '', PRIMARY KEY(a));

INSERT INTO t1 (a) VALUES 

(''), ('CENTRAL'), ('EASTERN'), ('GREATER LONDON'),

('NORTH CENTRAL'), ('NORTH EAST'), ('NORTH WEST'), ('SCOTLAND'),

('SOUTH EAST'), ('SOUTH WEST'), ('WESTERN');

EXPLAIN SELECT DISTINCT a,a FROM t1 ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	PRIMARY	66	NULL	12	Using index for group-by

SELECT DISTINCT a,a FROM t1 ORDER BY a;

a	a

	

CENTRAL	CENTRAL

EASTERN	EASTERN

GREATER LONDON	GREATER LONDON

NORTH CENTRAL	NORTH CENTRAL

NORTH EAST	NORTH EAST

NORTH WEST	NORTH WEST

SCOTLAND	SCOTLAND

SOUTH EAST	SOUTH EAST

SOUTH WEST	SOUTH WEST

WESTERN	WESTERN

DROP TABLE t1;