Commit 6ea42e67 authored by unknown's avatar unknown
Browse files

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
parents 46fd7dec 5ec18e1d

client/mysqltest.c

+2 −0
Original line number Diff line number Diff line
@@ -224,11 +224,13 @@ struct st_connection 
  char *name;

  MYSQL_STMT* stmt;



#ifdef EMBEDDED_LIBRARY

  const char *cur_query;

  int cur_query_len;

  pthread_mutex_t mutex;

  pthread_cond_t cond;

  int query_done;

#endif /*EMBEDDED_LIBRARY*/

};

struct st_connection connections[128];

struct st_connection* cur_con, *next_con, *connections_end;

mysql-test/r/compare.result

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ create table t1 (a tinyint(1),b binary(1)); 
insert into t1 values (0x01,0x01);

select * from t1 where a=b;

a	b

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: ''

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

a	b

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: ''

drop table if exists t1;

mysql-test/r/func_gconcat.result

+38 −0
Original line number Diff line number Diff line
@@ -64,11 +64,49 @@ grp group_concat(a order by a,d+c-ascii(c)-a) 
1	1

2	2,3

3	4,5,6,7,8,9

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'c         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'E         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'C         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'D         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'c         '

Warning	1292	Truncated incorrect DOUBLE value: 'D         '

select grp,group_concat(a order by d+c-ascii(c),a) from t1 group by grp;

grp	group_concat(a order by d+c-ascii(c),a)

1	1

2	3,2

3	7,8,4,6,9,5

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'c         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'E         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'C         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'D         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'd         '

Warning	1292	Truncated incorrect DOUBLE value: 'c         '

Warning	1292	Truncated incorrect DOUBLE value: 'D         '

select grp,group_concat(c order by 1) from t1 group by grp;

grp	group_concat(c order by 1)

1	a

mysql-test/r/func_group.result

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ NULL NULL 
1	7

2	20.25

3	45.483163247594

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'a         '

Warning	1292	Truncated incorrect DOUBLE value: 'b         '

Warning	1292	Truncated incorrect DOUBLE value: 'c         '

Warning	1292	Truncated incorrect DOUBLE value: 'C         '

Warning	1292	Truncated incorrect DOUBLE value: 'E         '

create table t2 (grp int, a bigint unsigned, c char(10));

insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;

replace into t2 select grp, a, c from t1 limit 2,1;

mysql-test/r/func_in.result

+9 −0
Original line number Diff line number Diff line
@@ -358,16 +358,22 @@ select f1 from t1 where f1 in ('a',1); 
f1

a

1

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'b'

select f1, case f1 when 'a' then '+' when 1 then '-' end from t1;

f1	case f1 when 'a' then '+' when 1 then '-' end

a	+

b	NULL

1	-

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'b'

create index t1f1_idx on t1(f1);

select f1 from t1 where f1 in ('a',1);

f1

1

a

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'b'

explain select f1 from t1 where f1 in ('a',1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	t1f1_idx	2	NULL	3	Using where; Using index
@@ -381,6 +387,9 @@ id select_type table type possible_keys key key_len ref rows Extra 
select f1 from t1 where f1 in (2,1);

f1

1

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

Warning	1292	Truncated incorrect DOUBLE value: 'b'

explain select f1 from t1 where f1 in (2,1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	t1f1_idx	t1f1_idx	2	NULL	3	Using where; Using index