mirror of
https://github.com/MariaDB/server.git
synced 2025-11-09 11:41:36 +03:00
Post merge fixes.
mysql-test/r/sp.result: Enabled the cs test as it works now. mysql-test/t/sp.test: Enabled the cs test as it works now.
This commit is contained in:
@@ -27,7 +27,7 @@ call foo();
|
||||
PROCEDURE foo does not exist
|
||||
drop procedure if exists foo;
|
||||
Warnings:
|
||||
Warning 1256 PROCEDURE foo does not exist
|
||||
Warning 1257 PROCEDURE foo does not exist
|
||||
create procedure foo()
|
||||
foo: loop
|
||||
leave bar;
|
||||
|
||||
@@ -327,9 +327,17 @@ drop procedure into_dumpfile;
|
||||
create procedure create_select(x char(16), y int)
|
||||
begin
|
||||
insert into test.t1 values (x, y);
|
||||
create table test.t2 select * from test.t1;
|
||||
insert into test.t2 values (concat(x, "2"), y+2);
|
||||
create table test.t3 select * from test.t1;
|
||||
insert into test.t3 values (concat(x, "2"), y+2);
|
||||
end;
|
||||
drop table if exists t3;
|
||||
call create_select("cs", 90);
|
||||
select * from t1, t3;
|
||||
id data id data
|
||||
cs 90 cs 90
|
||||
cs 90 cs2 92
|
||||
drop table if exists t3;
|
||||
delete from t1;
|
||||
drop procedure create_select;
|
||||
create function e() returns double
|
||||
return 2.7182818284590452354;
|
||||
|
||||
@@ -298,7 +298,7 @@ set sql_log_bin=1;
|
||||
set sql_log_off=1;
|
||||
set sql_log_update=1;
|
||||
Warnings:
|
||||
Note 1266 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
||||
Note 1267 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
||||
set sql_low_priority_updates=1;
|
||||
set sql_max_join_size=200;
|
||||
select @@sql_max_join_size,@@max_join_size;
|
||||
|
||||
Reference in New Issue
Block a user