post-merge fixes to make tests pass after merging BUG#39934 to 5.1-rep+3.

This commit is contained in:
Sven Sandberg 2009-09-30 18:20:52 +02:00
parent 3d467f04a1
commit 613068c10a
2 changed files with 2 additions and 2 deletions

View file

@ -506,8 +506,6 @@ select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
call bug14210_fill_table()|
Warnings:
Note 1592 Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason: Statement uses a system variable whose value may differ on slave.
drop procedure bug14210_fill_table|
create table t4 like t3|
create procedure bug14210()

View file

@ -527,7 +527,9 @@ begin
select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
--disable_warnings
call bug14210_fill_table()|
--enable_warnings
drop procedure bug14210_fill_table|
create table t4 like t3|