bk commit into 5.1 tree (malff:1.2341) BUG#22619

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-11-06 10:41:51-07:00, malff@weblab.(none) +8 -0
  Bug#18239 (Possible to overload internal functions with stored functions)
  Bug#21025 (misleading error message when creating functions named 'x', or 'y')
  Bug#22619 (Spaces considered harmful)
  
  This change contains a fix to report warnings or errors, and multiple tests
  cases.
  
  Before this fix, name collisions between:
  - Native functions
  - User Defined Functions
  - Stored Functions
  were not systematically reported, leading to confusing behavior.
  
  I) Native / User Defined Function
  
  Before this fix, is was possible to create a UDF named "foo", with the same
  name as a native function "foo", but it was impossible to invoke the UDF,
  since the syntax "foo()" always refer to the native function.
  After this fix, creating a UDF fails with an error if there is a name
  collision with a native function.
  
  II) Native / Stored Function
  
  Before this fix, is was possible to create a SF named "db.foo", with the same
  name as a native function "foo", but this was confusing since the syntax
  "foo()" would refer to the native function. To refer to the Stored Function,
  the user had to use the "db.foo()" syntax.
  After this fix, creating a Stored Function reports a warning if there is a
  name collision with a native function.
  
  III) User Defined Function / Stored Function
  
  Before this fix, creating a User Defined Function "foo" and a Stored Function
  "db.foo" are mutually exclusive operations. Whenever the second function is
  created, an error is reported. However, the test suite did not cover this
  behavior.
  After this fix, the  behavior is unchanged, and is now covered by test cases.
  
  Note that the code change in this patch depends on the fix for Bug 21114.

  mysql-test/r/sp.result@stripped, 2006-11-06 10:41:47-07:00, malff@weblab.(none) +104 -0
    New test cases.

  mysql-test/r/sp_gis.result@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +30 -0
    New test cases.

  mysql-test/r/sp_gis.result@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +0 -0

  mysql-test/r/udf.result@stripped, 2006-11-06 10:41:47-07:00, malff@weblab.(none) +16 -0
    New test cases.

  mysql-test/t/sp.test@stripped, 2006-11-06 10:41:47-07:00, malff@weblab.(none) +106 -0
    New test cases.

  mysql-test/t/sp_gis.test@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +35 -0
    New test cases.

  mysql-test/t/sp_gis.test@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +0 -0

  mysql-test/t/udf.test@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +36 -0
    New test cases.

  sql/share/errmsg.txt@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +2 -0
    Name collisions with native functions.

  sql/sql_parse.cc@stripped, 2006-11-06 10:41:48-07:00, malff@weblab.(none) +19 -1
    Name collisions with native functions.

# 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:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-18239

--- 1.591/sql/sql_parse.cc	2006-11-06 10:41:58 -07:00
+++ 1.592/sql/sql_parse.cc	2006-11-06 10:41:58 -07:00
@@ -28,6 +28,7 @@
 #include "sp_cache.h"
 #include "events.h"
 #include "event_data_objects.h"
+#include "item_create.h"
 
 #ifdef HAVE_OPENSSL
 /*
@@ -3972,6 +3973,11 @@ end_with_restore_list:
   {
     if (check_access(thd,INSERT_ACL,"mysql",0,1,0,0))
       break;
+    if (find_native_function_builder(thd, lex->spname->m_name))
+    {
+      my_error(ER_NATIVE_FCT_NAME_COLLISION, MYF(0), lex->spname->m_name.str);
+      goto error;
+    }
 #ifdef HAVE_DLOPEN
     if (sp_find_routine(thd, TYPE_ENUM_FUNCTION, lex->spname,
                         &thd->sp_func_cache, FALSE))
@@ -4388,7 +4394,8 @@ end_with_restore_list:
     int result;
 
     DBUG_ASSERT(lex->sphead != 0);
-    DBUG_ASSERT(lex->sphead->m_db.str); /* Must be initialized in the parser */
+    DBUG_ASSERT(lex->sphead->m_db.str);        /* Initialized in the parser */
+    DBUG_ASSERT(lex->sphead->m_name.str);      /* Initialized in the parser */
 
     if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str, 0, 0, 0,
                      is_schema_db(lex->sphead->m_db.str)))
@@ -4406,6 +4413,17 @@ end_with_restore_list:
     }
 
     name= lex->sphead->name(&namelen);
+
+    if (  (lex->sphead->m_type == TYPE_ENUM_FUNCTION)
+        && find_native_function_builder(thd, lex->sphead->m_name))
+    {
+      push_warning_printf(thd,
+                          MYSQL_ERROR::WARN_LEVEL_NOTE,
+                          ER_NATIVE_FCT_NAME_COLLISION,
+                          ER(ER_NATIVE_FCT_NAME_COLLISION),
+                          lex->sphead->m_name.str);
+    }
+
 #ifdef HAVE_DLOPEN
     if (lex->sphead->m_type == TYPE_ENUM_FUNCTION)
     {

--- 1.133/sql/share/errmsg.txt	2006-11-06 10:41:58 -07:00
+++ 1.134/sql/share/errmsg.txt	2006-11-06 10:41:58 -07:00
@@ -6010,4 +6010,6 @@ ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT 42000
         eng "Incorrect parameter count in the call to native function '%-.64s'"
 ER_WRONG_PARAMETERS_TO_NATIVE_FCT 42000
         eng "Incorrect parameters in the call to native function '%-.64s'"
+ER_NATIVE_FCT_NAME_COLLISION
+        eng "This function '%-.64s' has the same name as a native function."
 
--- New file ---
+++ mysql-test/r/sp_gis.result	06/11/06 10:41:48
use test;
drop function if exists a;
drop function if exists x;
drop function if exists y;
create function a() returns int
return 1;
create function x() returns int
return 2;
Warnings:
Note	1578	This function 'x' has the same name as a native function.
create function y() returns int
return 3;
Warnings:
Note	1578	This function 'y' has the same name as a native function.
select a();
a()
1
select x();
ERROR 42000: Incorrect parameter count in the call to native function 'x'
select y();
ERROR 42000: Incorrect parameter count in the call to native function 'y'
select x(PointFromText("POINT(10 20)")), y(PointFromText("POINT(10 20)"));
x(PointFromText("POINT(10 20)"))	y(PointFromText("POINT(10 20)"))
10	20
select test.a(), test.x(), test.y();
test.a()	test.x()	test.y()
1	2	3
drop function a;
drop function x;
drop function y;

--- New file ---
+++ mysql-test/t/sp_gis.test	06/11/06 10:41:48
-- source include/have_geometry.inc

use test;

#
# BUG#21025: misleading error message when creating functions named 'x', or 'y'
#

--disable_warnings
drop function if exists a;
drop function if exists x;
drop function if exists y;
--enable_warnings

create function a() returns int
return 1;

create function x() returns int
return 2;

create function y() returns int
return 3;

select a();
--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
select x();
--error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
select y();
select x(PointFromText("POINT(10 20)")), y(PointFromText("POINT(10 20)"));
select test.a(), test.x(), test.y();

drop function a;
drop function x;
drop function y;



--- 1.8/mysql-test/r/udf.result	2006-11-06 10:41:58 -07:00
+++ 1.9/mysql-test/r/udf.result	2006-11-06 10:41:58 -07:00
@@ -106,6 +106,22 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
 drop table t1;
 End of 5.0 tests.
+drop function if exists pi;
+CREATE FUNCTION pi RETURNS STRING SONAME "should_not_parse.so";
+ERROR HY000: This function 'pi' has the same name as a native function.
+DROP FUNCTION IF EXISTS metaphon;
+CREATE FUNCTION metaphon(a int) RETURNS int
+return 0;
+CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+ERROR HY000: Function 'metaphon' already exists
+DROP FUNCTION metaphon;
+CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
+CREATE FUNCTION metaphon(a int) RETURNS int
+return 0;
+ERROR HY000: Function 'metaphon' already exists
+CREATE FUNCTION test.metaphon(a int) RETURNS int
+return 0;
+ERROR HY000: Function 'metaphon' already exists
 DROP FUNCTION metaphon;
 DROP FUNCTION myfunc_double;
 DROP FUNCTION myfunc_nonexist;

--- 1.9/mysql-test/t/udf.test	2006-11-06 10:41:58 -07:00
+++ 1.10/mysql-test/t/udf.test	2006-11-06 10:41:58 -07:00
@@ -130,6 +130,42 @@ drop table t1;
 --echo End of 5.0 tests.
 
 #
+# BUG#18239: Possible to overload internal functions with stored functions
+#
+
+--disable_warnings
+drop function if exists pi;
+--enable_warnings
+
+--error ER_NATIVE_FCT_NAME_COLLISION
+CREATE FUNCTION pi RETURNS STRING SONAME "should_not_parse.so";
+
+# Verify that Stored Functions and UDF are mutually exclusive
+DROP FUNCTION IF EXISTS metaphon;
+
+CREATE FUNCTION metaphon(a int) RETURNS int
+return 0;
+
+--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
+--error ER_UDF_EXISTS
+eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_LIB";
+
+DROP FUNCTION metaphon;
+
+--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
+eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_LIB";
+
+--error ER_UDF_EXISTS
+CREATE FUNCTION metaphon(a int) RETURNS int
+return 0;
+
+--error ER_UDF_EXISTS
+CREATE FUNCTION test.metaphon(a int) RETURNS int
+return 0;
+
+# End of Bug#18239
+
+#
 # Drop the example functions from udf_example
 #
 

--- 1.232/mysql-test/r/sp.result	2006-11-06 10:41:58 -07:00
+++ 1.233/mysql-test/r/sp.result	2006-11-06 10:41:58 -07:00
@@ -2178,6 +2178,7 @@ set @stamped_time=in_time;
 set x=2;
 end if;
 end|
+set time_zone='+03:00';
 call bug3426(1000, @i)|
 select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
 @i	time
@@ -5627,4 +5628,107 @@ Called B
 drop procedure proc_21462_a|
 drop procedure proc_21462_b|
 End of 5.0 tests
+Begin of 5.1 tests
+drop function if exists pi;
+create function pi() returns varchar(50)
+return "pie, my favorite desert.";
+Warnings:
+Note	1578	This function 'pi' has the same name as a native function.
+SET @save_sql_mode=@@sql_mode;
+SET SQL_MODE='IGNORE_SPACE';
+select pi(), pi ();
+pi()	pi ()
+3.141593	3.141593
+select test.pi(), test.pi ();
+test.pi()	test.pi ()
+pie, my favorite desert.	pie, my favorite desert.
+SET SQL_MODE='';
+select pi(), pi ();
+pi()	pi ()
+3.141593	3.141593
+select test.pi(), test.pi ();
+test.pi()	test.pi ()
+pie, my favorite desert.	pie, my favorite desert.
+SET @@sql_mode=@save_sql_mode;
+drop function pi;
+drop function if exists test.database;
+drop function if exists test.current_user;
+drop function if exists test.md5;
+create database nowhere;
+use nowhere;
+drop database nowhere;
+SET @save_sql_mode=@@sql_mode;
+SET SQL_MODE='IGNORE_SPACE';
+select database(), database ();
+database()	database ()
+NULL	NULL
+select current_user(), current_user ();
+current_user()	current_user ()
+root@localhost	root@localhost
+select md5("aaa"), md5 ("aaa");
+md5("aaa")	md5 ("aaa")
+47bce5c74f589f4867dbd57e9ca9f808	47bce5c74f589f4867dbd57e9ca9f808
+SET SQL_MODE='';
+select database(), database ();
+database()	database ()
+NULL	NULL
+select current_user(), current_user ();
+current_user()	current_user ()
+root@localhost	root@localhost
+select md5("aaa"), md5 ("aaa");
+md5("aaa")	md5 ("aaa")
+47bce5c74f589f4867dbd57e9ca9f808	47bce5c74f589f4867dbd57e9ca9f808
+use test;
+create function `database`() returns varchar(50)
+return "Stored function database";
+create function `current_user`() returns varchar(50)
+return "Stored function current_user";
+create function md5(x varchar(50)) returns varchar(50)
+return "Stored function md5";
+Warnings:
+Note	1578	This function 'md5' has the same name as a native function.
+SET SQL_MODE='IGNORE_SPACE';
+select database(), database ();
+database()	database ()
+test	test
+select current_user(), current_user ();
+current_user()	current_user ()
+root@localhost	root@localhost
+select md5("aaa"), md5 ("aaa");
+md5("aaa")	md5 ("aaa")
+47bce5c74f589f4867dbd57e9ca9f808	47bce5c74f589f4867dbd57e9ca9f808
+select test.database(), test.database ();
+test.database()	test.database ()
+Stored function database	Stored function database
+select test.current_user(), test.current_user ();
+test.current_user()	test.current_user ()
+Stored function current_user	Stored function current_user
+select test.md5("aaa"), test.md5 ("aaa");
+test.md5("aaa")	test.md5 ("aaa")
+Stored function md5	Stored function md5
+SET SQL_MODE='';
+select database(), database ();
+database()	database ()
+test	test
+select current_user(), current_user ();
+current_user()	current_user ()
+root@localhost	root@localhost
+select md5("aaa"), md5 ("aaa");
+md5("aaa")	md5 ("aaa")
+47bce5c74f589f4867dbd57e9ca9f808	47bce5c74f589f4867dbd57e9ca9f808
+select test.database(), test.database ();
+test.database()	test.database ()
+Stored function database	Stored function database
+select test.current_user(), test.current_user ();
+test.current_user()	test.current_user ()
+Stored function current_user	Stored function current_user
+select test.md5("aaa"), test.md5 ("aaa");
+test.md5("aaa")	test.md5 ("aaa")
+Stored function md5	Stored function md5
+SET @@sql_mode=@save_sql_mode;
+drop function test.database;
+drop function test.current_user;
+drop function md5;
+use test;
+End of 5.1 tests
 drop table t1,t2;

--- 1.210/mysql-test/t/sp.test	2006-11-06 10:41:58 -07:00
+++ 1.211/mysql-test/t/sp.test	2006-11-06 10:41:58 -07:00
@@ -11,6 +11,7 @@
 # Tests that uses 'goto' to into sp-goto.test (currently disabled)
 # Tests that destroys system tables (e.g. mysql.proc) for error testing
 #   go to sp-destruct.
+# Tests that require --with-geometry go into sp_gis.test
 
 use test;
 
@@ -2584,6 +2585,9 @@ begin
   end if;
 end|
 
+# so that from_unixtime() has a deterministic result
+set time_zone='+03:00';
+
 call bug3426(1000, @i)|
 select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
 call bug3426(NULL, @i)|
@@ -6585,6 +6589,108 @@ drop procedure proc_21462_b|
 
 --echo End of 5.0 tests
 
+--echo Begin of 5.1 tests
+
+#
+# BUG#18239: Possible to overload internal functions with stored functions
+#
+
+delimiter ;|
+
+--disable_warnings
+drop function if exists pi;
+--enable_warnings
+
+create function pi() returns varchar(50)
+return "pie, my favorite desert.";
+
+SET @save_sql_mode=@@sql_mode;
+
+SET SQL_MODE='IGNORE_SPACE';
+
+select pi(), pi ();
+select test.pi(), test.pi ();
+
+SET SQL_MODE='';
+
+select pi(), pi ();
+select test.pi(), test.pi ();
+
+SET @@sql_mode=@save_sql_mode;
+
+drop function pi;
+# End of BUG#18239
+
+#
+# BUG#22619: Spaces considered harmful
+#
+
+--disable_warnings
+drop function if exists test.database;
+drop function if exists test.current_user;
+drop function if exists test.md5;
+--enable_warnings
+
+create database nowhere;
+use nowhere;
+drop database nowhere;
+
+SET @save_sql_mode=@@sql_mode;
+
+SET SQL_MODE='IGNORE_SPACE';
+
+select database(), database ();
+select current_user(), current_user ();
+select md5("aaa"), md5 ("aaa");
+
+SET SQL_MODE='';
+
+select database(), database ();
+select current_user(), current_user ();
+select md5("aaa"), md5 ("aaa");
+
+use test;
+
+create function `database`() returns varchar(50)
+return "Stored function database";
+
+create function `current_user`() returns varchar(50)
+return "Stored function current_user";
+
+create function md5(x varchar(50)) returns varchar(50)
+return "Stored function md5";
+
+SET SQL_MODE='IGNORE_SPACE';
+
+select database(), database ();
+select current_user(), current_user ();
+select md5("aaa"), md5 ("aaa");
+
+select test.database(), test.database ();
+select test.current_user(), test.current_user ();
+select test.md5("aaa"), test.md5 ("aaa");
+
+SET SQL_MODE='';
+
+select database(), database ();
+select current_user(), current_user ();
+select md5("aaa"), md5 ("aaa");
+
+select test.database(), test.database ();
+select test.current_user(), test.current_user ();
+select test.md5("aaa"), test.md5 ("aaa");
+
+SET @@sql_mode=@save_sql_mode;
+
+drop function test.database;
+drop function test.current_user;
+drop function md5;
+
+use test;
+delimiter |;
+# End of BUG#22619
+
+--echo End of 5.1 tests
 
 #
 # BUG#NNNN: New bug synopsis