bk commit into 5.1 tree (iggy:1.2491) BUG#23491

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.1 repository of iggy. When iggy 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, 2007-03-29 11:12:12-04:00, iggy@recycle.(none) +3 -0
  Bug #23491 MySQLDump prefix function call in a view by database name
  - 5.0 merged to 5.1 differences.

  sql/item_create.cc@stripped, 2007-03-29 11:12:10-04:00, iggy@recycle.(none) +4 -4
    Bug #23491 MySQLDump prefix function call in a view by database name
    - Added use_explicit_name to Create_sp_func::create method.
    - Default use_explicit_name to false when db name not specified.
    - Use use_explicit_name when creating sp_name object.

  sql/item_create.h@stripped, 2007-03-29 11:12:10-04:00, iggy@recycle.(none) +2 -1
    Bug #23491 MySQLDump prefix function call in a view by database name
    - Updated virtual function definition.

  sql/sql_yacc.yy@stripped, 2007-03-29 11:12:10-04:00, iggy@recycle.(none) +1 -1
    Bug #23491 MySQLDump prefix function call in a view by database name
    - Use new create method.

# 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:	iggy
# Host:	recycle.(none)
# Root:	/src/bug23491/my51-bug23491

--- 1.73/sql/item_create.cc	2007-01-12 06:24:32 -05:00
+++ 1.74/sql/item_create.cc	2007-03-29 11:12:10 -04:00
@@ -167,7 +167,7 @@
 {
 public:
   virtual Item* create(THD *thd, LEX_STRING db, LEX_STRING name,
-                       List<Item> *item_list);
+                       bool use_explicit_name, List<Item> *item_list);
 
   static Create_sp_func s_singleton;
 
@@ -2316,7 +2316,7 @@
   if (thd->copy_db_to(&db.str, &db.length))
     return NULL;
 
-  return create(thd, db, name, item_list);
+  return create(thd, db, name, false, item_list);
 }
 
 
@@ -2433,7 +2433,7 @@
 
 Item*
 Create_sp_func::create(THD *thd, LEX_STRING db, LEX_STRING name,
-                       List<Item> *item_list)
+                       bool use_explicit_name, List<Item> *item_list)
 {
   int arg_count= 0;
   Item *func= NULL;
@@ -2458,7 +2458,7 @@
   if (item_list != NULL)
     arg_count= item_list->elements;
 
-  qname= new (thd->mem_root) sp_name(db, name);
+  qname= new (thd->mem_root) sp_name(db, name, use_explicit_name);
   qname->init_qname(thd);
   sp_add_used_routine(lex, thd, qname, TYPE_ENUM_FUNCTION);
 

--- 1.48/sql/item_create.h	2006-12-30 19:06:34 -05:00
+++ 1.49/sql/item_create.h	2007-03-29 11:12:10 -04:00
@@ -87,11 +87,12 @@
     @param thd The current thread
     @param db The database name
     @param name The function name
+    @param use_explicit_name Should the function be represented as 'db.name'?
     @param item_list The list of arguments to the function, can be NULL
     @return An item representing the parsed function call
   */
   virtual Item* create(THD *thd, LEX_STRING db, LEX_STRING name,
-                       List<Item> *item_list) = 0;
+                       bool use_explicit_name, List<Item> *item_list) = 0;
 
 protected:
   /** Constructor. */

--- 1.554/sql/sql_yacc.yy	2007-03-29 10:42:00 -04:00
+++ 1.555/sql/sql_yacc.yy	2007-03-29 11:12:10 -04:00
@@ -6921,7 +6921,7 @@
 
           builder= find_qualified_function_builder(thd);
           DBUG_ASSERT(builder);
-          item= builder->create(thd, $1, $3, $5);
+          item= builder->create(thd, $1, $3, true, $5);
 
           if (! ($$= item))
           {