Commit 83caa434 authored by unknown's avatar unknown
Browse files

After merge fixes. 


mysql-test/r/sp.result:
  After merge fix.
mysql-test/t/sp.test:
  After merge fixes. Restored test for bug 21002 which has mysteriously
  disappeared from 5.1 tree.
parent 35f7ae16

mysql-test/r/sp.result

+1 −1
Original line number Diff line number Diff line
@@ -5407,7 +5407,7 @@ drop database if exists това_е_дълго_име_за_база_данни_ 
create database това_е_дълго_име_за_база_данни_нали|

INSERT INTO mysql.proc VALUES ('това_е_дълго_име_за_база_данни_нали','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','PROCEDURE','това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго','SQL','CONTAINS_SQL','NO','DEFINER','','','bad_body','root@localhost',now(), now(),'','')|

call това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго()|

ERROR HY000: Failed to load routine това_е_дълго_име_за_база_данни_нали.това_е_процедура_с_доста_дълго_име_нали_и_още_по_дълго. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

ERROR HY000: Failed to load routine това_е_дълго_име_за_база_данни_нали.. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

drop database това_е_дълго_име_за_база_данни_нали|

CREATE TABLE t3 (

Member_ID varchar(15) NOT NULL,

mysql-test/t/sp.test

+26 −19
Original line number Diff line number Diff line
@@ -6258,6 +6258,32 @@ SELECT * FROM t11| 
DROP TABLE t11, t12|

DROP FUNCTION bug19862|





# Bug#21002 "Derived table not selecting from a "real" table fails in JOINs"

#         

# A regression caused by the fix for Bug#18444: for derived tables we should

# set an empty string as the current database. They do not belong to any

# database and must be usable even if there is no database

# selected.

--disable_warnings

drop table if exists t3|

drop database if exists mysqltest1|

--enable_warnings

create table t3 (a int)|

insert into t3 (a) values (1), (2)|



create database mysqltest1|

use mysqltest1|

drop database mysqltest1|



# No current database

select database()|



select * from (select 1 as a) as t1 natural join (select * from test.t3) as t2|

use test|

drop table t3|





# Test for BUG#16899: Possible buffer overflow in handling of DEFINER-clause.

#

# Prepare.
@@ -6326,25 +6352,6 @@ call това_е_дълго_име_за_база_данни_нали.това_е 
drop database това_е_дълго_име_за_база_данни_нали|





#

# BUG#21414: SP: Procedure undroppable, to some extent

#

--disable_warnings

DROP PROCEDURE IF EXISTS bug21414|

--enable_warnings



CREATE PROCEDURE bug21414() SELECT 1|



FLUSH TABLES WITH READ LOCK|



--error ER_CANT_UPDATE_WITH_READLOCK

DROP PROCEDURE bug21414|



UNLOCK TABLES|



--echo The following should succeed.

DROP PROCEDURE bug21414|



#

# BUG#21493: Crash on the second call of a procedure containing

#            a select statement that uses an IN aggregating subquery