Commit 81655600 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged
parents 7dbf0235 26373380

mysql-test/r/func_str.result

+15 −0
Original line number Diff line number Diff line
@@ -850,3 +850,18 @@ trackname artistname 
April In Paris Vernon Duke	Vernon Duke

Autumn In New York	NULL

DROP TABLE t1,t2,t3;

create table t1 (b varchar(5));

insert t1 values ('ab'), ('abc'), ('abcd'), ('abcde');

select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1;

b	substring(b,1)	substring(b,-1)	substring(b,-2)	substring(b,-3)	substring(b,-4)	substring(b,-5)

ab	ab	b	ab			

abc	abc	c	bc	abc		

abcd	abcd	d	cd	bcd	abcd	

abcde	abcde	e	de	cde	bcde	abcde

select * from (select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1) t;

b	substring(b,1)	substring(b,-1)	substring(b,-2)	substring(b,-3)	substring(b,-4)	substring(b,-5)

ab	ab	b	ab			

abc	abc	c	bc	abc		

abcd	abcd	d	cd	bcd	abcd	

abcde	abcde	e	de	cde	bcde	abcde

drop table t1;

mysql-test/t/func_str.test

+9 −0
Original line number Diff line number Diff line
@@ -597,3 +597,12 @@ SELECT CONCAT_WS(' ', trackname, artistname) trackname, artistname 
    WHERE CONCAT_WS(' ', trackname, artistname) LIKE '%In%';



DROP TABLE t1,t2,t3;



#

# Correct length reporting from substring() (BUG#10269)

#

create table t1 (b varchar(5));

insert t1 values ('ab'), ('abc'), ('abcd'), ('abcde');

select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1;

select * from (select *,substring(b,1),substring(b,-1),substring(b,-2),substring(b,-3),substring(b,-4),substring(b,-5) from t1) t;

drop table t1;

sql/item_strfunc.cc

+2 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,8 @@ void Item_func_substr::fix_length_and_dec() 
  collation.set(args[0]->collation);

  if (args[1]->const_item())

  {

    int32 start=(int32) args[1]->val_int()-1;

    int32 start= (int32) args[1]->val_int();

    start= (int32)((start < 0) ? max_length + start : start - 1);

    if (start < 0 || start >= (int32) max_length)

      max_length=0; /* purecov: inspected */

    else