Commit 93d0d3c6 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/sql_yacc.yy:
  Auto merged
parents b5a1c8a6 20ba6d92

mysql-test/r/bugs.result→mysql-test/r/default.result

+0 −0

File moved.

View file

mysql-test/r/sp-error.result

+13 −0
Original line number Diff line number Diff line
@@ -658,4 +658,17 @@ create procedure bug9529_9012345678901234567890123456789012345678901234567890123 
begin

end|

ERROR 42000: Identifier name 'bug9529_90123456789012345678901234567890123456789012345678901234567890' is too long

drop procedure if exists bug10969|

create procedure bug10969()

begin

declare s1 int default 0;

select default(s1) from t30;

end|

ERROR 42000: Incorrect column name 's1'

create procedure bug10969()

begin

declare s1 int default 0;

select default(t30.s1) from t30;

end|

drop procedure bug10969|

drop table t1|

mysql-test/r/sp.result

+29 −0
Original line number Diff line number Diff line
@@ -3109,4 +3109,33 @@ select bug9559()| 
bug9559()

-3

drop function bug9559|

drop procedure if exists bug10961|

create procedure bug10961()

begin

declare v char;

declare x int;

declare c cursor for select * from dual;

declare continue handler for sqlexception select x;

set x = 1;

open c;

set x = 2;

fetch c into v;

set x = 3;

close c;

end|

call bug10961()|

x

1

x

2

x

3

call bug10961()|

x

1

x

2

x

3

drop procedure bug10961|

drop table t1,t2;

mysql-test/t/bugs.test→mysql-test/t/default.test

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
--disable_warnings

drop table if exists t1,t2,t3,t4,t5,t6;

drop database if exists mysqltest;

--enable_warnings



#

# Bug 10838
@@ -39,6 +38,7 @@ CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ', 
                 a1 varchar(30) binary NOT NULL DEFAULT ' ',

		 b1 tinyblob NULL)

ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;

--enable_warnings



SHOW CREATE TABLE t1;

INSERT into t1 (b) values ('1');

mysql-test/t/sp-error.test

+23 −0
Original line number Diff line number Diff line
@@ -930,6 +930,29 @@ begin 
end|





#

# BUG#10969: Stored procedures: crash if default() function

#

--disable_warnings

drop procedure if exists bug10969|

--enable_warnings

--error ER_WRONG_COLUMN_NAME

create procedure bug10969()

begin

  declare s1 int default 0;

  select default(s1) from t30;

end|



# This should work

create procedure bug10969()

begin

  declare s1 int default 0;

  select default(t30.s1) from t30;

end|



drop procedure bug10969|





#

# BUG#NNNN: New bug synopsis

#