bk commit into 5.0 tree (konstantin:1.1957)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.1957 05/06/03 00:02:47 konstantin@stripped +5 -0
  Give Item_arena::is_stmt_prepare a more descriptive name (it marks 
  the code that is active for SP as well in 5.0)

  sql/sql_union.cc
    1.118 05/06/03 00:02:42 konstantin@stripped +1 -1
    Rename of an Item_arena method.

  sql/sql_parse.cc
    1.445 05/06/03 00:02:41 konstantin@stripped +2 -2
    Rename of an Item_arena method.

  sql/sql_class.h
    1.233 05/06/03 00:02:41 konstantin@stripped +2 -1
    Rename of an Item_arena method.

  sql/item_subselect.cc
    1.106 05/06/03 00:02:41 konstantin@stripped +1 -1
    Rename of an Item_arena method.

  sql/item.cc
    1.131 05/06/03 00:02:41 konstantin@stripped +1 -1
    Rename of an Item_arena 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.130/sql/item.cc	2005-06-02 09:49:57 +04:00
+++ 1.131/sql/item.cc	2005-06-03 00:02:41 +04:00
@@ -1027,7 +1027,7 @@
     structure can go away and pop up again between subsequent executions
     of a prepared statement).
   */
-  if (thd->current_arena->is_stmt_prepare())
+  if (thd->current_arena->is_stmt_prepare_or_first_sp_execute())
   {
     if (db_name)
       orig_db_name= thd->strdup(db_name);

--- 1.232/sql/sql_class.h	2005-05-26 23:01:46 +04:00
+++ 1.233/sql/sql_class.h	2005-06-03 00:02:41 +04:00
@@ -695,7 +695,8 @@
   virtual Type type() const;
   virtual ~Item_arena() {};
 
-  inline bool is_stmt_prepare() const { return (int)state < (int)PREPARED; }
+  inline bool is_stmt_prepare_or_first_sp_execute() const
+  { return (int)state < (int)PREPARED; }
   inline bool is_first_stmt_execute() const { return state == PREPARED; }
   inline bool is_stmt_execute() const
   { return state == PREPARED || state == EXECUTED; }

--- 1.444/sql/sql_parse.cc	2005-06-02 08:15:16 +04:00
+++ 1.445/sql/sql_parse.cc	2005-06-03 00:02:41 +04:00
@@ -5894,7 +5894,7 @@
     ptr->db= empty_c_string;
     ptr->db_length= 0;
   }
-  if (thd->current_arena->is_stmt_prepare())
+  if (thd->current_arena->is_stmt_prepare_or_first_sp_execute())
     ptr->db= thd->strdup(ptr->db);
 
   ptr->alias= alias_str;
@@ -6972,7 +6972,7 @@
       against the opened tables to ensure we don't use a table that is part
       of the view (which can only be done after the table has been opened).
     */
-    if (thd->current_arena->is_stmt_prepare())
+    if (thd->current_arena->is_stmt_prepare_or_first_sp_execute())
     {
       /*
         For temporary tables we don't have to check if the created table exists

--- 1.117/sql/sql_union.cc	2005-05-30 21:49:52 +04:00
+++ 1.118/sql/sql_union.cc	2005-06-03 00:02:42 +04:00
@@ -323,7 +323,7 @@
       }
       if (tmp_arena)
         thd->restore_backup_item_arena(tmp_arena, &backup);
-      if (arena->is_stmt_prepare())
+      if (arena->is_stmt_prepare_or_first_sp_execute())
       {
 	/* prepare fake select to initialize it correctly */
 	init_prepare_fake_select_lex(thd);

--- 1.105/sql/item_subselect.cc	2005-06-02 09:49:57 +04:00
+++ 1.106/sql/item_subselect.cc	2005-06-03 00:02:41 +04:00
@@ -362,7 +362,7 @@
         because we do not rollback this changes
         TODO: make rollback for it, or special name resolving mode in 5.0.
       */
-      !arena->is_stmt_prepare()
+      !arena->is_stmt_prepare_or_first_sp_execute()
       )
   {