Commit 43176fa7 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 

into  siva.hindu.god:/usr/home/tim/m/bk/50


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
parents 36cfef5a f23adec9

mysql-test/r/func_misc.result

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ SELECT IS_USED_LOCK('bug16501'); 
IS_USED_LOCK('bug16501')

NULL

DROP TABLE t1;

select export_set(3, _latin1'foo', _utf8'bar', ',', 4);

export_set(3, _latin1'foo', _utf8'bar', ',', 4)

foo,foo,bar,bar

End of 4.1 tests

create table t1 as select uuid(), length(uuid());

show create table t1;

Table	Create Table
@@ -130,3 +134,4 @@ timediff(b, a) >= '00:00:03' 
drop table t2;

drop table t1;

set global query_cache_size=default;

End of 5.0 tests

mysql-test/t/func_misc.test

+10 −2
Original line number Diff line number Diff line
@@ -78,7 +78,13 @@ connection default; 


DROP TABLE t1;



# End of 4.1 tests

#

# Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets

#

select export_set(3, _latin1'foo', _utf8'bar', ',', 4);



--echo End of 4.1 tests





#

# Test for BUG#9535
@@ -87,7 +93,9 @@ create table t1 as select uuid(), length(uuid()); 
show create table t1;

drop table t1;



#

# Bug #6760: Add SLEEP() function

#

create table t1 (a timestamp default '2005-05-05 01:01:01',

                 b timestamp default '2005-05-05 01:01:01');

insert into t1 set a = now();
@@ -117,4 +125,4 @@ drop table t2; 
drop table t1;

set global query_cache_size=default;



# End of 5.0 tests
 
--echo End of 5.0 tests