Commit 5373a7ec authored by unknown's avatar unknown
Browse files

Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 

into  maint2.mysql.com:/data/localhome/tsmith/bk/50


sql-common/client.c:
  Auto merged
sql/item_func.h:
  Auto merged
BUILD/check-cpu:
  Manual merge
parents c57a76ce 3f496439

BUILD/check-cpu

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ check_cpu () { 
    *Opteron*)

      cpu_arg="opteron";

      ;;

    # MacOSX / Intel  

    *i386*i486*)

      cpu_arg="pentium-m";

      ;;



    # Intel ia64

    *Itanium*)
@@ -131,7 +135,7 @@ check_cpu () { 
  fi



  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`



  case "$cc_ver--$cc_verno" in

    *GCC*)

libmysqld/libmysqld.def

+1 −0
Original line number Diff line number Diff line
@@ -163,3 +163,4 @@ EXPORTS 
	my_charset_bin

	my_charset_same

	modify_defaults_file

        mysql_set_server_option

mysql-test/r/compare.result

+7 −0
Original line number Diff line number Diff line
@@ -42,3 +42,10 @@ CHAR(31) = '' '' = CHAR(31) 
SELECT CHAR(30) = '', '' = CHAR(30);

CHAR(30) = ''	'' = CHAR(30)

0	0

create table t1 (a tinyint(1),b binary(1));

insert into t1 values (0x01,0x01);

select * from t1 where a=b;

a	b

select * from t1 where a=b and b=0x01;

a	b

drop table if exists t1;

mysql-test/r/distinct.result

+11 −0
Original line number Diff line number Diff line
@@ -563,6 +563,17 @@ id IFNULL(dsc, '-') 
2	line number two

3	line number three

drop table t1;

CREATE TABLE t1 (a int primary key, b int);

INSERT INTO t1 (a,b) values (1,1), (2,3), (3,2);

explain SELECT DISTINCT a, b FROM t1 ORDER BY b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using filesort

SELECT DISTINCT a, b FROM t1 ORDER BY b;

a	b

1	1

3	2

2	3

DROP TABLE t1;

CREATE TABLE t1 (

ID int(11) NOT NULL auto_increment,

x varchar(20) default NULL,

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -821,3 +821,12 @@ a b real_b 
68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;

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

INSERT INTO t1 VALUES (1, 1), (2, 2), (3,3), (4,4);

EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort

DROP TABLE t1;