Commit c295bd80 authored by unknown's avatar unknown
Browse files

Move test that requires innodb to sp_trans

parent 3e12f98a

mysql-test/r/sp-security.result

+0 −10
Original line number Diff line number Diff line
@@ -314,16 +314,6 @@ select * from db_bug14533.t1; 
ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'

drop user user_bug14533@localhost;

drop database db_bug14533;

CREATE DATABASE db_bug7787;

use db_bug7787;

CREATE PROCEDURE p1()

SHOW INNODB STATUS;

Warnings:

Warning	1541	The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.

GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost;

DROP DATABASE db_bug7787;

drop user user_bug7787@localhost;

use test;



---> connection: root

DROP DATABASE IF EXISTS mysqltest;

mysql-test/r/sp.result

+0 −16
Original line number Diff line number Diff line
@@ -4796,22 +4796,6 @@ i 
0

drop table t3|

drop procedure bug16887|

create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|

insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|

CREATE FUNCTION bug13575 ( p1 integer ) 

returns varchar(3) 

BEGIN 

DECLARE v1 VARCHAR(10) DEFAULT null;

SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 

RETURN v1;

END|

select distinct f1, bug13575(f1) from t3 order by f1|

f1	bug13575(f1)

1	aaa

2	bbb

3	ccc

drop function bug13575;

drop table t3|

drop procedure if exists bug16474_1|

drop procedure if exists bug16474_2|

delete from t1|

mysql-test/r/sp_trans.result

+26 −0
Original line number Diff line number Diff line
@@ -530,3 +530,29 @@ count(*) 
drop table t3, t4|

drop procedure bug14210|

set @@session.max_heap_table_size=default|

CREATE DATABASE db_bug7787|

use db_bug7787|

CREATE PROCEDURE p1()

SHOW INNODB STATUS; |

Warnings:

Warning	1541	The syntax 'SHOW INNODB STATUS' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW ENGINE INNODB STATUS' instead.

GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost|

DROP DATABASE db_bug7787|

drop user user_bug7787@localhost|

use test|

create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|

insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|

CREATE FUNCTION bug13575 ( p1 integer ) 

returns varchar(3) 

BEGIN 

DECLARE v1 VARCHAR(10) DEFAULT null;

SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 

RETURN v1;

END|

select distinct f1, bug13575(f1) from t3 order by f1|

f1	bug13575(f1)

1	aaa

2	bbb

3	ccc

drop function bug13575|

drop table t3|

mysql-test/t/sp-security.test

+0 −23
Original line number Diff line number Diff line
@@ -526,29 +526,6 @@ drop user user_bug14533@localhost; 
drop database db_bug14533;





#

# BUG#7787: Stored procedures: improper warning for "grant execute" statement

#



# Prepare.



CREATE DATABASE db_bug7787;

use db_bug7787;



# Test.



CREATE PROCEDURE p1()

  SHOW INNODB STATUS; 



GRANT EXECUTE ON PROCEDURE p1 TO user_bug7787@localhost; 



# Cleanup.



DROP DATABASE db_bug7787;

drop user user_bug7787@localhost;

use test;





#

# WL#2897: Complete definer support in the stored routines.

#

mysql-test/t/sp.test

+0 −17
Original line number Diff line number Diff line
@@ -5636,23 +5636,6 @@ call bug16887()| 
drop table t3|

drop procedure bug16887|



#

# Bug#13575 SP funcs in select with distinct/group and order by can

#           produce bad data

#

create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|

insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|

CREATE FUNCTION bug13575 ( p1 integer ) 

returns varchar(3) 

BEGIN 

DECLARE v1 VARCHAR(10) DEFAULT null;

SELECT f2 INTO v1 FROM t3 WHERE f1 = p1; 

RETURN v1;

END|

select distinct f1, bug13575(f1) from t3 order by f1|

drop function bug13575;

drop table t3|



#

# BUG#16474: SP crashed MySQL

# (when using "order by localvar", where 'localvar' is just that.