Commit e6b31ace authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents bb60631b 9f2d21f6

mysql-test/r/binary.result

+19 −0
Original line number Diff line number Diff line
@@ -141,3 +141,22 @@ t1 CREATE TABLE `t1` ( 
  `a` binary(1) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (col1 binary(4));

insert into t1 values ('a'),('a ');

select hex(col1) from t1;

hex(col1)

61000000

61200000

alter table t1 modify col1 binary(10);

select hex(col1) from t1;

hex(col1)

61000000000000000000

61200000000000000000

insert into t1 values ('b'),('b ');

select hex(col1) from t1;

hex(col1)

61000000000000000000

61200000000000000000

62000000000000000000

62200000000000000000

drop table t1;

mysql-test/r/sp.result

+14 −0
Original line number Diff line number Diff line
@@ -4768,6 +4768,20 @@ Handler 
Inner

drop procedure bug15011|

drop table t3|

drop function if exists bug17615|

create table t3 (a varchar(256) unicode)|

create function bug17615() returns varchar(256) unicode

begin

declare tmp_res varchar(256) unicode;

set tmp_res= 'foo string';

return tmp_res;

end|

insert into t3 values(bug17615())|

select * from t3|

a

foo string

drop function bug17615|

drop table t3|

drop procedure if exists bug17476|

create table t3 ( d date )|

insert into t3 values

mysql-test/r/type_decimal.result

+7 −0
Original line number Diff line number Diff line
@@ -772,3 +772,10 @@ productid zlevelprice 
003trans	39.98

004trans	31.18

drop table t1, t2;

create table t1 (f1 decimal(5));

insert into t1 values (40);

flush tables;

select f1 from t1 where f1 in (select f1 from t1);

f1

40

drop table t1;

mysql-test/t/binary.test

+12 −0
Original line number Diff line number Diff line
@@ -89,3 +89,15 @@ show create table t1; 
drop table t1;



# End of 4.1 tests



#

# Bug#16857

#

create table t1 (col1 binary(4));

insert into t1 values ('a'),('a ');

select hex(col1) from t1;

alter table t1 modify col1 binary(10);

select hex(col1) from t1;

insert into t1 values ('b'),('b ');

select hex(col1) from t1;

drop table t1;

mysql-test/t/sp.test

+22 −0
Original line number Diff line number Diff line
@@ -5616,6 +5616,28 @@ drop table t3| 




#

# BUG#17615: problem with character set

#

--disable_warnings

drop function if exists bug17615|

--enable_warnings



create table t3 (a varchar(256) unicode)|



create function bug17615() returns varchar(256) unicode

begin

  declare tmp_res varchar(256) unicode;

  set tmp_res= 'foo string';

  return tmp_res;

end|



insert into t3 values(bug17615())|

select * from t3|



drop function bug17615|

drop table t3|





# BUG#17476: Stored procedure not returning data when it is called first

#            time per connection

#