Commit efbf373b authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
parents 08d1de2c f948d7bb

mysql-test/r/func_str.result

+9 −0
Original line number Diff line number Diff line
@@ -273,3 +273,12 @@ i ELT(j, '345', '34') 
1	345

2	34

DROP TABLE t1;

create table t1(a char(4));

insert into t1 values ('one'),(NULL),('two'),('four');

select a, quote(a), isnull(quote(a)), quote(a) is null, ifnull(quote(a), 'n') from t1;

a	quote(a)	isnull(quote(a))	quote(a) is null	ifnull(quote(a), 'n')

one	'one'	0	0	'one'

NULL	NULL	1	1	n

two	'two'	0	0	'two'

four	'four'	0	0	'four'

drop table t1;

mysql-test/t/func_str.test

+9 −0
Original line number Diff line number Diff line
@@ -163,3 +163,12 @@ CREATE TABLE t1 (i int, j int); 
INSERT INTO t1 VALUES (1,1),(2,2);

SELECT DISTINCT i, ELT(j, '345', '34') FROM t1;

DROP TABLE t1;



#

# bug #3756: quote and NULL

#



create table t1(a char(4));

insert into t1 values ('one'),(NULL),('two'),('four');

select a, quote(a), isnull(quote(a)), quote(a) is null, ifnull(quote(a), 'n') from t1;

drop table t1;

sql/item_strfunc.cc

+1 −0
Original line number Diff line number Diff line
@@ -2215,6 +2215,7 @@ String *Item_func_quote::val_str(String *str) 
  }

  *to= '\'';

  str->length(new_length);

  null_value= 0;

  return str;



null: