Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
drop database if exists mysqltest;
|
2005-07-30 10:19:57 +02:00
|
|
|
drop table if exists t1, t2, t3, t4;
|
|
|
|
drop procedure if exists sp1;
|
|
|
|
drop procedure if exists sp2;
|
|
|
|
drop procedure if exists sp3;
|
|
|
|
drop procedure if exists sp4;
|
|
|
|
drop function if exists f1;
|
|
|
|
drop function if exists f2;
|
|
|
|
drop function if exists f3;
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
create database mysqltest;
|
|
|
|
use mysqltest//
|
2005-07-30 10:19:57 +02:00
|
|
|
create procedure sp1 ()
|
|
|
|
begin
|
|
|
|
drop table if exists t1;
|
|
|
|
select 1 as "my-col";
|
|
|
|
end;
|
|
|
|
//
|
|
|
|
select database();
|
|
|
|
database()
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
mysqltest
|
2005-07-30 10:19:57 +02:00
|
|
|
call sp1();
|
|
|
|
my-col
|
|
|
|
1
|
|
|
|
Warnings:
|
2013-07-03 18:02:48 +02:00
|
|
|
Note 1051 Unknown table 'mysqltest.t1'
|
2005-07-30 10:19:57 +02:00
|
|
|
select database();
|
|
|
|
database()
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
mysqltest
|
2005-07-30 10:19:57 +02:00
|
|
|
use test;
|
|
|
|
select database();
|
|
|
|
database()
|
|
|
|
test
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
call mysqltest.sp1();
|
2005-07-30 10:19:57 +02:00
|
|
|
my-col
|
|
|
|
1
|
|
|
|
Warnings:
|
2013-07-03 18:02:48 +02:00
|
|
|
Note 1051 Unknown table 'mysqltest.t1'
|
2005-07-30 10:19:57 +02:00
|
|
|
select database();
|
|
|
|
database()
|
|
|
|
test
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
drop procedure mysqltest.sp1;
|
|
|
|
drop database mysqltest;
|
2005-07-30 10:19:57 +02:00
|
|
|
create procedure sp1()
|
|
|
|
begin
|
|
|
|
create table t1 (a int);
|
|
|
|
insert into t1 values (10);
|
|
|
|
end//
|
|
|
|
create procedure sp2()
|
|
|
|
begin
|
|
|
|
create table t2(a int);
|
|
|
|
insert into t2 values(1);
|
|
|
|
call sp1();
|
|
|
|
end//
|
|
|
|
create function f1() returns int
|
|
|
|
begin
|
|
|
|
return (select max(a) from t1);
|
|
|
|
end//
|
|
|
|
create procedure sp3()
|
|
|
|
begin
|
|
|
|
call sp1();
|
|
|
|
select 'func', f1();
|
|
|
|
end//
|
|
|
|
call sp1();
|
|
|
|
select 't1',a from t1;
|
|
|
|
t1 a
|
|
|
|
t1 10
|
|
|
|
drop table t1;
|
|
|
|
call sp2();
|
|
|
|
select 't1',a from t1;
|
|
|
|
t1 a
|
|
|
|
t1 10
|
|
|
|
select 't2',a from t2;
|
|
|
|
t2 a
|
|
|
|
t2 1
|
|
|
|
drop table t1, t2;
|
|
|
|
call sp3();
|
|
|
|
func f1()
|
|
|
|
func 10
|
|
|
|
select 't1',a from t1;
|
|
|
|
t1 a
|
|
|
|
t1 10
|
|
|
|
drop table t1;
|
|
|
|
drop procedure sp1;
|
|
|
|
drop procedure sp2;
|
|
|
|
drop procedure sp3;
|
|
|
|
drop function f1;
|
|
|
|
create procedure sp1()
|
|
|
|
begin
|
|
|
|
create temporary table t2(a int);
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
end//
|
|
|
|
create procedure sp2()
|
|
|
|
begin
|
|
|
|
create temporary table t1 (a int);
|
|
|
|
insert into t1 values(1);
|
|
|
|
call sp1();
|
|
|
|
select 't1', a from t1;
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
select 't2', a from t2;
|
2005-07-30 10:19:57 +02:00
|
|
|
drop table t1;
|
|
|
|
drop table t2;
|
|
|
|
end//
|
|
|
|
call sp2();
|
|
|
|
t1 a
|
|
|
|
t1 1
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
t2 a
|
|
|
|
t2 1
|
2005-07-30 10:19:57 +02:00
|
|
|
drop procedure sp1;
|
|
|
|
drop procedure sp2;
|
|
|
|
create table t1 (a int);
|
|
|
|
insert into t1 values(1),(2);
|
|
|
|
create table t2 as select * from t1;
|
|
|
|
create table t3 as select * from t1;
|
|
|
|
create table t4 as select * from t1;
|
|
|
|
create procedure sp1(a int)
|
|
|
|
begin
|
|
|
|
select a;
|
|
|
|
end //
|
|
|
|
create function f1() returns int
|
|
|
|
begin
|
|
|
|
return (select max(a) from t1);
|
|
|
|
end //
|
|
|
|
CALL sp1(f1());
|
|
|
|
a
|
|
|
|
2
|
|
|
|
create procedure sp2(a int)
|
|
|
|
begin
|
|
|
|
select * from t3;
|
|
|
|
select a;
|
|
|
|
end //
|
|
|
|
create procedure sp3()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
call sp2(5);
|
|
|
|
end //
|
|
|
|
create procedure sp4()
|
|
|
|
begin
|
|
|
|
select * from t2;
|
|
|
|
call sp3();
|
|
|
|
end //
|
|
|
|
call sp4();
|
|
|
|
a
|
|
|
|
1
|
|
|
|
2
|
|
|
|
a
|
|
|
|
1
|
|
|
|
2
|
|
|
|
a
|
|
|
|
1
|
|
|
|
2
|
|
|
|
a
|
|
|
|
5
|
|
|
|
drop procedure sp1;
|
|
|
|
drop procedure sp2;
|
|
|
|
drop procedure sp3;
|
|
|
|
drop procedure sp4;
|
|
|
|
drop function f1;
|
|
|
|
drop view if exists v1;
|
|
|
|
create function f1(ab int) returns int
|
|
|
|
begin
|
|
|
|
declare i int;
|
|
|
|
set i= (select max(a) from t1 where a < ab) ;
|
|
|
|
return i;
|
|
|
|
end //
|
|
|
|
create function f2(ab int) returns int
|
|
|
|
begin
|
|
|
|
declare i int;
|
|
|
|
set i= (select max(a) from t2 where a < ab) ;
|
|
|
|
return i;
|
|
|
|
end //
|
|
|
|
create view v1 as
|
|
|
|
select t3.a as x, t4.a as y, f2(3) as z
|
|
|
|
from t3, t4 where t3.a = t4.a //
|
|
|
|
create procedure sp1()
|
|
|
|
begin
|
|
|
|
declare a int;
|
|
|
|
set a= (select f1(4) + count(*) A from t1, v1);
|
|
|
|
end //
|
|
|
|
create function f3() returns int
|
|
|
|
begin
|
|
|
|
call sp1();
|
|
|
|
return 1;
|
|
|
|
end //
|
|
|
|
call sp1() //
|
|
|
|
select f3() //
|
|
|
|
f3()
|
|
|
|
1
|
|
|
|
select f3() //
|
|
|
|
f3()
|
|
|
|
1
|
|
|
|
call sp1() //
|
|
|
|
drop procedure sp1//
|
|
|
|
drop function f3//
|
|
|
|
create procedure sp1()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare c cursor for select f1(3) + count(*) from v1;
|
|
|
|
open c;
|
|
|
|
fetch c into x;
|
|
|
|
end;//
|
|
|
|
create function f3() returns int
|
|
|
|
begin
|
|
|
|
call sp1();
|
|
|
|
return 1;
|
|
|
|
end //
|
|
|
|
call sp1() //
|
|
|
|
call sp1() //
|
|
|
|
select f3() //
|
|
|
|
f3()
|
|
|
|
1
|
|
|
|
call sp1() //
|
Add new option "check-testcases" to mysql-test-run.pl
Cleanup the sideeffects from most of the testcases with sideeffects.
mysql-test/mysql-test-run.pl:
Add option "check-testcases" to mysql-test-run.pl
Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
Drop table t1 at end of test
mysql-test/r/grant2.result:
Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
Drop table t1 at end of test
mysql-test/r/query_cache.result:
Drop function "f1"
mysql-test/r/read_only.result:
Reset the "read_only" flag
mysql-test/r/rpl000001.result:
Remove user "blafasel2"
mysql-test/r/rpl000017.result:
Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
Delete users to cleanup
Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
Drop trigger wl2818_trg1 and wl2818_trg2.
Drop table t1, t2
Drop database mysqltest_db1
And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
Reset query_cache_size to original value
mysql-test/t/join_outer.test:
Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
Drop table t1 to cleanup
mysql-test/t/query_cache.test:
Drop function "f1" to cleanup
mysql-test/t/read_only.test:
Reset the readonly flag
mysql-test/t/rpl000001.test:
Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
Drop table t1, t2 t3 and t4 to cleanup
Drop view v1
mysql-test/t/sp-security.test:
Delete test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
Drop table t1, t2
Drop users
drop database mysqltest_db1
mysql-test/t/type_bit.test:
drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
Increase max_join_size to 100.
mysql-test/t/variables.test:
Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
New BitKeeper file ``mysql-test/include/check-testcase.test''
2006-01-26 17:54:34 +01:00
|
|
|
drop view v1;
|
|
|
|
drop table t1,t2,t3,t4;
|
2005-07-30 10:19:57 +02:00
|
|
|
drop function f1;
|
|
|
|
drop function f2;
|
|
|
|
drop function f3;
|
|
|
|
drop procedure sp1;
|
2006-03-28 13:06:29 +02:00
|
|
|
drop table if exists t1;
|
|
|
|
drop view if exists v1, v2, v3;
|
|
|
|
drop function if exists bug15683;
|
|
|
|
create table t1 (f1 bigint, f2 varchar(20), f3 bigint);
|
|
|
|
insert into t1 set f1 = 1, f2 = 'schoenenbourg', f3 = 1;
|
|
|
|
create view v1 as select 1 from t1 union all select 1;
|
|
|
|
create view v2 as select 1 from v1;
|
|
|
|
create view v3 as select 1 as f1 from v2;
|
|
|
|
create function bug15683() returns bigint
|
|
|
|
begin
|
|
|
|
return (select count(*) from v3);
|
|
|
|
end|
|
|
|
|
prepare stmt from "select bug15683()";
|
|
|
|
execute stmt;
|
|
|
|
bug15683()
|
|
|
|
2
|
|
|
|
execute stmt;
|
|
|
|
bug15683()
|
|
|
|
2
|
|
|
|
deallocate prepare stmt;
|
|
|
|
drop table t1;
|
|
|
|
drop view v1, v2, v3;
|
|
|
|
drop function bug15683;
|
2006-06-20 23:50:20 +02:00
|
|
|
drop table if exists t1, t2, t3;
|
|
|
|
drop function if exists bug19634;
|
|
|
|
create table t1 (id int, data int);
|
|
|
|
create table t2 (id int);
|
|
|
|
create table t3 (data int);
|
|
|
|
create function bug19634() returns int return (select count(*) from t3);
|
|
|
|
prepare stmt from "delete t1 from t1, t2 where t1.id = t2.id and bug19634()";
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
create trigger t1_bi before delete on t1 for each row insert into t3 values (old.data);
|
|
|
|
prepare stmt from "delete t1 from t1, t2 where t1.id = t2.id";
|
|
|
|
execute stmt;
|
|
|
|
execute stmt;
|
|
|
|
deallocate prepare stmt;
|
|
|
|
drop function bug19634;
|
|
|
|
drop table t1, t2, t3;
|
2007-05-18 10:29:06 +02:00
|
|
|
drop table if exists bug_27907_logs;
|
|
|
|
drop table if exists bug_27907_t1;
|
|
|
|
create table bug_27907_logs (a int);
|
|
|
|
create table bug_27907_t1 (a int);
|
|
|
|
create trigger bug_27907_t1_ai after insert on bug_27907_t1
|
|
|
|
for each row
|
|
|
|
begin
|
|
|
|
insert into bug_27907_logs (a) values (1);
|
|
|
|
end|
|
|
|
|
drop table bug_27907_logs;
|
|
|
|
insert into bug_27907_t1(a) values (1);
|
|
|
|
ERROR 42S02: Table 'test.bug_27907_logs' doesn't exist
|
|
|
|
drop table bug_27907_t1;
|
2007-07-18 15:09:03 +02:00
|
|
|
|
|
|
|
Bug#22427 create table if not exists + stored function results in
|
|
|
|
inconsistent behavior
|
|
|
|
|
|
|
|
Add a test case, the bug itself was fixed by the patch for
|
|
|
|
Bug#20662
|
|
|
|
|
|
|
|
drop table if exists t1;
|
|
|
|
drop function if exists f_bug22427;
|
|
|
|
create table t1 (i int);
|
|
|
|
insert into t1 values (1);
|
|
|
|
create function f_bug22427() returns int return (select max(i) from t1);
|
|
|
|
select f_bug22427();
|
|
|
|
f_bug22427()
|
|
|
|
1
|
|
|
|
create table if not exists t1 select f_bug22427() as i;
|
|
|
|
Warnings:
|
|
|
|
Note 1050 Table 't1' already exists
|
|
|
|
create table t1 select f_bug22427() as i;
|
|
|
|
ERROR 42S01: Table 't1' already exists
|
|
|
|
drop table t1;
|
|
|
|
drop function f_bug22427;
|
2007-07-27 16:56:29 +02:00
|
|
|
#
|
|
|
|
# Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables
|
|
|
|
#
|
|
|
|
DROP table IF EXISTS t1,t2;
|
|
|
|
CREATE TABLE t1 (c1 INT);
|
|
|
|
CREATE TABLE t2 (c2 INT);
|
|
|
|
INSERT INTO t1 VALUES (1);
|
|
|
|
INSERT INTO t2 VALUES (2);
|
|
|
|
CREATE TRIGGER t1_ai AFTER INSERT ON t1 FOR EACH ROW
|
|
|
|
BEGIN
|
|
|
|
UPDATE t2 SET c2= c2 + 1;
|
|
|
|
END//
|
|
|
|
# Take a table lock on t1.
|
|
|
|
# This should pre-lock t2 through the trigger.
|
|
|
|
LOCK TABLE t1 WRITE;
|
|
|
|
INSERT INTO t1 VALUES (3);
|
|
|
|
UNLOCK TABLES;
|
|
|
|
LOCK TABLE t1 READ;
|
|
|
|
INSERT INTO t2 values(4);
|
|
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
|
|
UNLOCK TABLES;
|
|
|
|
SELECT * FROM t1;
|
|
|
|
c1
|
|
|
|
1
|
|
|
|
3
|
|
|
|
SELECT * FROM t2;
|
|
|
|
c2
|
|
|
|
3
|
|
|
|
DROP TRIGGER t1_ai;
|
|
|
|
DROP TABLE t1, t2;
|
2006-06-20 23:50:20 +02:00
|
|
|
End of 5.0 tests
|
2016-05-18 07:37:29 +02:00
|
|
|
#
|
|
|
|
# Bug#21142859: FUNCTION UPDATING A VIEW FAILS TO FIND TABLE THAT ACTUALLY EXISTS
|
|
|
|
#
|
|
|
|
CREATE TABLE t1 SELECT 1 AS fld1, 'A' AS fld2;
|
|
|
|
CREATE TABLE t2 (fld3 INT, fld4 CHAR(1));
|
|
|
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
|
|
|
CREATE TRIGGER t1_au AFTER UPDATE ON t1
|
|
|
|
FOR EACH ROW INSERT INTO t2 VALUES (new.fld1, new.fld2);
|
|
|
|
CREATE FUNCTION f1() RETURNS INT
|
|
|
|
BEGIN
|
|
|
|
UPDATE v1 SET fld2='B' WHERE fld1=1;
|
|
|
|
RETURN row_count();
|
|
|
|
END !
|
|
|
|
# Without the patch, an error was getting reported.
|
|
|
|
SELECT f1();
|
|
|
|
f1()
|
|
|
|
1
|
|
|
|
DROP FUNCTION f1;
|
|
|
|
DROP VIEW v1;
|
|
|
|
DROP TABLE t1,t2;
|
2016-07-25 15:06:52 +02:00
|
|
|
#
|
|
|
|
# Bug #16672723 "CAN'T FIND TEMPORARY TABLE".
|
|
|
|
#
|
|
|
|
CREATE FUNCTION f1() RETURNS INT RETURN 1;
|
|
|
|
CREATE TEMPORARY TABLE tmp1(a INT);
|
|
|
|
PREPARE stmt1 FROM "CREATE TEMPORARY TABLE tmp2 AS SELECT b FROM (SELECT f1() AS b FROM tmp1) AS t";
|
|
|
|
# The below statement failed before the fix.
|
|
|
|
EXECUTE stmt1;
|
|
|
|
DROP TEMPORARY TABLES tmp1, tmp2;
|
|
|
|
DEALLOCATE PREPARE stmt1;
|
|
|
|
DROP FUNCTION f1;
|
|
|
|
create procedure sp1()
|
|
|
|
begin
|
|
|
|
drop table if exists t1, t2;
|
|
|
|
create temporary table t1 select 1 v;
|
|
|
|
create table t2 (col varchar(45)) select distinct col from (select sf1() as col from t1) t;
|
|
|
|
end$$
|
|
|
|
create function sf1() returns text return 'blah';
|
|
|
|
call test.sp1();
|
|
|
|
call test.sp1();
|
|
|
|
drop procedure sp1;
|
|
|
|
drop function sf1;
|
|
|
|
drop table t2;
|