bk commit into 5.1 tree (dlenev:1.2333)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-29 21:05:12+04:00, dlenev@stripped +2 -0
  After merge fixes.

  mysql-test/r/sp.result@stripped, 2006-09-29 21:05:09+04:00, dlenev@stripped +1 -1
    After merge fix.

  mysql-test/t/sp.test@stripped, 2006-09-29 21:05:09+04:00, dlenev@stripped +26 -19
    After merge fixes. Restored test for bug 21002 which has mysteriously
    disappeared from 5.1 tree.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.1-rt-merge

--- 1.229/mysql-test/r/sp.result	2006-09-29 21:05:18 +04:00
+++ 1.230/mysql-test/r/sp.result	2006-09-29 21:05:18 +04:00
@@ -5407,7 +5407,7 @@
 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,

--- 1.208/mysql-test/t/sp.test	2006-09-29 21:05:18 +04:00
+++ 1.209/mysql-test/t/sp.test	2006-09-29 21:05:18 +04:00
@@ -6258,6 +6258,32 @@
 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.
@@ -6325,25 +6351,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