bk commit into 5.0 tree (andrey:1.1963) BUG#10362

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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
  1.1963 05/08/09 18:28:22 andrey@lmy004. +3 -0
  fix for bug #10362 (SHOW PROCEDURE always qualifies name with database)

  sql/sp.cc
    1.87 05/08/09 18:28:16 andrey@lmy004. +0 -2
    don't add the name of the database - don't fully qualify

  mysql-test/r/sp.result
    1.142 05/08/09 18:28:16 andrey@lmy004. +10 -10
    fix test result after fix for bug #10362

  mysql-test/r/information_schema.result
    1.70 05/08/09 18:28:16 andrey@lmy004. +2 -2
    fix test after fix for bug #10362

# 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:	andrey
# Host:	lmy004.
# Root:	/home/andrey/mysql-5.0-bug10362

--- 1.69/mysql-test/r/information_schema.result	2005-08-05 11:01:23 +02:00
+++ 1.70/mysql-test/r/information_schema.result	2005-08-09 18:28:16 +02:00
@@ -300,7 +300,7 @@
 sub1		
 show create function sub2;
 Function	sql_mode	Create Function
-sub2		CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
+sub2		CREATE FUNCTION `sub2`(i int) RETURNS int(11)
 return i+1
 show function status like "sub2";
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
@@ -308,7 +308,7 @@
 drop function sub2;
 show create procedure sel2;
 Procedure	sql_mode	Create Procedure
-sel2		CREATE PROCEDURE `test`.`sel2`()
+sel2		CREATE PROCEDURE `sel2`()
 begin
 select * from t1;
 select * from t2;

--- 1.141/mysql-test/r/sp.result	2005-08-03 05:44:29 +02:00
+++ 1.142/mysql-test/r/sp.result	2005-08-09 18:28:16 +02:00
@@ -788,7 +788,7 @@
   insert into t1 values ("chistics", 1)|
 show create procedure chistics|
 Procedure	sql_mode	Create Procedure
-chistics		CREATE PROCEDURE `test`.`chistics`()
+chistics		CREATE PROCEDURE `chistics`()
     MODIFIES SQL DATA
     COMMENT 'Characteristics procedure test'
 insert into t1 values ("chistics", 1)
@@ -800,7 +800,7 @@
 alter procedure chistics sql security invoker|
 show create procedure chistics|
 Procedure	sql_mode	Create Procedure
-chistics		CREATE PROCEDURE `test`.`chistics`()
+chistics		CREATE PROCEDURE `chistics`()
     MODIFIES SQL DATA
     SQL SECURITY INVOKER
     COMMENT 'Characteristics procedure test'
@@ -815,7 +815,7 @@
   return 42|
 show create function chistics|
 Function	sql_mode	Create Function
-chistics		CREATE FUNCTION `test`.`chistics`() RETURNS int(11)
+chistics		CREATE FUNCTION `chistics`() RETURNS int(11)
     DETERMINISTIC
     SQL SECURITY INVOKER
     COMMENT 'Characteristics procedure test'
@@ -828,7 +828,7 @@
 comment 'Characteristics function test'|
 show create function chistics|
 Function	sql_mode	Create Function
-chistics		CREATE FUNCTION `test`.`chistics`() RETURNS int(11)
+chistics		CREATE FUNCTION `chistics`() RETURNS int(11)
     NO SQL
     DETERMINISTIC
     SQL SECURITY INVOKER
@@ -1210,7 +1210,7 @@
 end|
 show create procedure opp|
 Procedure	sql_mode	Create Procedure
-opp		CREATE PROCEDURE `test`.`opp`(n bigint unsigned, out pp bool)
+opp		CREATE PROCEDURE `opp`(n bigint unsigned, out pp bool)
 begin
 declare r double;
 declare b, s bigint unsigned default 0;
@@ -1263,7 +1263,7 @@
 alter procedure bar|
 show create procedure bar|
 Procedure	sql_mode	Create Procedure
-bar		CREATE PROCEDURE `test`.`bar`(x char(16), y int)
+bar		CREATE PROCEDURE `bar`(x char(16), y int)
     COMMENT '3333333333'
 insert into test.t1 values (x, y)
 show procedure status like 'bar'|
@@ -1821,20 +1821,20 @@
 set @@sql_mode = ''|
 show create procedure bug2564_1|
 Procedure	sql_mode	Create Procedure
-bug2564_1		CREATE PROCEDURE `test`.`bug2564_1`()
+bug2564_1		CREATE PROCEDURE `bug2564_1`()
     COMMENT 'Joe''s procedure'
 insert into `t1` values ("foo", 1)
 show create procedure bug2564_2|
 Procedure	sql_mode	Create Procedure
-bug2564_2	ANSI_QUOTES	CREATE PROCEDURE "test"."bug2564_2"()
+bug2564_2	ANSI_QUOTES	CREATE PROCEDURE "bug2564_2"()
 insert into "t1" values ('foo', 1)
 show create function bug2564_3|
 Function	sql_mode	Create Function
-bug2564_3		CREATE FUNCTION `test`.`bug2564_3`(x int, y int) RETURNS int(11)
+bug2564_3		CREATE FUNCTION `bug2564_3`(x int, y int) RETURNS int(11)
 return x || y
 show create function bug2564_4|
 Function	sql_mode	Create Function
-bug2564_4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI	CREATE FUNCTION
"test"."bug2564_4"(x int, y int) RETURNS int(11)
+bug2564_4	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI	CREATE FUNCTION
"bug2564_4"(x int, y int) RETURNS int(11)
 return x || y
 drop procedure bug2564_1|
 drop procedure bug2564_2|

--- 1.86/sql/sp.cc	2005-08-03 12:13:59 +02:00
+++ 1.87/sql/sp.cc	2005-08-09 18:28:16 +02:00
@@ -1536,8 +1536,6 @@
     buf->append("FUNCTION ", 9);
   else
     buf->append("PROCEDURE ", 10);
-  append_identifier(thd, buf, name->m_db.str, name->m_db.length);
-  buf->append('.');
   append_identifier(thd, buf, name->m_name.str, name->m_name.length);
   buf->append('(');
   buf->append(params, paramslen);