Commit d5be483c authored by unknown's avatar unknown
Browse files

retest the fix for bug #10362 (SHOW PROCEDURE always qualifies name with database) 

(already approved)


mysql-test/r/information_schema.result:
  update test results
mysql-test/r/sp.result:
  update test results
mysql-test/r/sql_mode.result:
  update test results
sql/sp.cc:
  don qualify the name
parent 5e938cfd

mysql-test/r/information_schema.result

+2 −2
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ Function sql_mode Create Function 
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
@@ -316,7 +316,7 @@ test sub2 FUNCTION mysqltest_1@localhost # # DEFINER 
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;

mysql-test/r/sp.result

+10 −10
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ comment 'Characteristics procedure test' 
  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 @@ delete from t1| 
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 @@ comment 'Characteristics procedure test' 
  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 @@ no sql 
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 while; 
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 comment "3333333333"| 
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 @@ return x || y$ 
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|

mysql-test/r/sql_mode.result

+4 −4
Original line number Diff line number Diff line
@@ -424,23 +424,23 @@ SET @@SQL_MODE=''; 
create function `foo` () returns int return 5;

show create function `foo`;

Function	sql_mode	Create Function

foo		CREATE FUNCTION `test`.`foo`() RETURNS int(11)

foo		CREATE FUNCTION `foo`() RETURNS int(11)

return 5

SET @@SQL_MODE='ANSI_QUOTES';

show create function `foo`;

Function	sql_mode	Create Function

foo		CREATE FUNCTION `test`.`foo`() RETURNS int(11)

foo		CREATE FUNCTION `foo`() RETURNS int(11)

return 5

drop function `foo`;

create function `foo` () returns int return 5;

show create function `foo`;

Function	sql_mode	Create Function

foo	ANSI_QUOTES	CREATE FUNCTION "test"."foo"() RETURNS int(11)

foo	ANSI_QUOTES	CREATE FUNCTION "foo"() RETURNS int(11)

return 5

SET @@SQL_MODE='';

show create function `foo`;

Function	sql_mode	Create Function

foo	ANSI_QUOTES	CREATE FUNCTION "test"."foo"() RETURNS int(11)

foo	ANSI_QUOTES	CREATE FUNCTION "foo"() RETURNS int(11)

return 5

drop function `foo`;

SET @@SQL_MODE='';

sql/sp.cc

+0 −2
Original line number Diff line number Diff line
@@ -1532,8 +1532,6 @@ create_string(THD *thd, String *buf, 
    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);