Commit 79a46e0b authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  merge
parents aae5fed3 4fc48f31

mysql-test/r/sp.result

+29 −0
Original line number Diff line number Diff line
@@ -4070,4 +4070,33 @@ a 
3

drop procedure bug14304|

drop table t3, t4|

drop procedure if exists bug14376|

create procedure bug14376()

begin

declare x int default x;

end|

call bug14376()|

ERROR 42S22: Unknown column 'x' in 'field list'

drop procedure bug14376|

create procedure bug14376()

begin

declare x int default 42;

begin

declare x int default x;

select x;

end;

end|

call bug14376()|

x

42

drop procedure bug14376|

create procedure bug14376(x int)

begin

declare x int default x;

select x;

end|

call bug14376(4711)|

x

4711

drop procedure bug14376|

drop table t1,t2;

mysql-test/r/update.result

+13 −0
Original line number Diff line number Diff line
@@ -345,3 +345,16 @@ f1 
2000-01-01

2002-02-02

drop table t1;

create table t1 (f1 int);

create table t2 (f2 int);

insert into t1 values(1),(2);

insert into t2 values(1),(1);

update t1,t2 set f1=3,f2=3 where f1=f2 and f1=1;

affected rows: 3

info: Rows matched: 3  Changed: 3  Warnings: 0

update t2 set f2=1;

update t1 set f1=1 where f1=3;

update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;

affected rows: 3

info: Rows matched: 3  Changed: 3  Warnings: 0

drop table t1,t2;

mysql-test/t/query_cache.test

+0 −2
Original line number Diff line number Diff line
@@ -756,8 +756,6 @@ show status like "Qcache_queries_in_cache"; 
show status like "Qcache_inserts";

show status like "Qcache_hits";

drop table t1;



#

# SP cursors and selects with query cache (BUG#9715)

#

create table t1 (a int);

mysql-test/t/sp.test

+45 −0
Original line number Diff line number Diff line
@@ -4855,6 +4855,51 @@ call bug14304()| 
drop procedure bug14304|

drop table t3, t4|



#

# BUG#14376: MySQL crash on scoped variable (re)initialization

#

--disable_warnings

drop procedure if exists bug14376|

--enable_warnings



create procedure bug14376()

begin

  declare x int default x;

end|



# Not the error we want, but that's what we got for now...

--error ER_BAD_FIELD_ERROR

call bug14376()|

drop procedure bug14376|



create procedure bug14376()

begin

  declare x int default 42;



  begin

    declare x int default x;



    select x;

  end;

end|



call bug14376()|



drop procedure bug14376|



create procedure bug14376(x int)

begin

  declare x int default x;



  select x;

end|



call bug14376(4711)|



drop procedure bug14376|







#

# BUG#NNNN: New bug synopsis

#

mysql-test/t/update.test

+17 −0
Original line number Diff line number Diff line
@@ -270,4 +270,21 @@ insert into t1 values('2000-01-01'),('0000-00-00'); 
update t1 set f1='2002-02-02' where f1 is null;

select * from t1;

drop table t1;



#

# Bug#15028 Multitable update returns different numbers of matched rows

#           depending on table order

create table t1 (f1 int);

create table t2 (f2 int);

insert into t1 values(1),(2);

insert into t2 values(1),(1);

--enable_info

update t1,t2 set f1=3,f2=3 where f1=f2 and f1=1;

--disable_info

update t2 set f2=1;

update t1 set f1=1 where f1=3;

--enable_info

update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;

--disable_info

drop table t1,t2;

# End of 4.1 tests