Commit 1b587ced authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-clean 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/func_str.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
mysql-test/t/disabled.def:
  Resolve conflict
parents 46c69084 eae6679f

.bzrignore

+1 −1
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ scripts/mysql_install_db 
scripts/mysql_secure_installation

scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1613,4 +1614,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
scripts/mysql_upgrade

mysql-test/r/func_str.result

+7 −0
Original line number Diff line number Diff line
@@ -1023,3 +1023,10 @@ select format(d, 2) from t1; 
format(d, 2)

NULL

drop table t1;

create table t1 (c varchar(40));

insert into t1 values ('y,abc'),('y,abc');

select c, substring_index(lcase(c), @q:=',', -1) as res from t1;

c	res

y,abc	abc

y,abc	abc

drop table t1;

mysql-test/r/subselect.result

+3 −3
Original line number Diff line number Diff line
@@ -215,9 +215,9 @@ select * from t1 where t1.a=(select t2.a from t2 where t2.b=(select max(a) from 
a

select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4;

b	(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2)

8	7.5

8	4.5

9	7.5

8	7.5000

8	4.5000

9	7.5000

explain extended select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ rpl_row_basic_3innodb : Bug #17385 
rpl_sp                  : Bug#16456

rpl_until               : Unstable test case, bug#15886

sp-goto                 : GOTO is currently is disabled - will be fixed in the future

subselect               : Bug#15706 (ps mode) [PATCH PENDING]

rpl_ndb_blob            : Bug #17505

rpl_ndb_blob2           : Bug #17505

rpl_ndb_log             : results are not deterministic

mysql-test/t/func_str.test

+8 −0
Original line number Diff line number Diff line
@@ -676,4 +676,12 @@ insert into t1 values (null); 
select format(d, 2) from t1;

drop table t1;



#

# Bug #14676: substring_index() returns incorrect results

#

create table t1 (c varchar(40));

insert into t1 values ('y,abc'),('y,abc');

select c, substring_index(lcase(c), @q:=',', -1) as res from t1;

drop table t1;



# End of 5.0 tests