Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0

BitKeeper/etc/logging_ok

@@ -73,6 +73,7 @@ monty@donna.mysql.fi
 monty@hundin.mysql.fi
 monty@mashka.(none)
 monty@mashka.mysql.fi
+monty@mishka.mysql.fi
 monty@narttu.
 monty@narttu.mysql.fi
 monty@rescue.

scripts/mysql_fix_privilege_tables.sql

@@ -99,3 +99,20 @@ ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
 ALTER TABLE host
 ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
 ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
+
+#
+# Create proc table if it doesn't exists
+#
+
+CREATE TABLE IF NOT EXISTS proc (
+  name char(64) binary DEFAULT '' NOT NULL,
+  type enum('function','procedure') NOT NULL,
+  body blob DEFAULT '' NOT NULL,
+  creator char(77) binary DEFAULT '' NOT NULL,
+  modified timestamp,
+  created timestamp,
+  suid enum ('N', 'Y') DEFAULT 'Y' NOT NULL,
+  comment char(64) binary DEFAULT '' NOT NULL,
+  PRIMARY KEY (name,type)
+) comment='Stored Procedures';
+

sql/sql_class.cc

@@ -1076,28 +1076,26 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
   List_iterator_fast<Item> li(list);
   List_iterator_fast<my_var> gl(var_list);
   Item *item;
-  my_var *mv;
-  LEX_STRING *ls;
 
+  local_vars.empty();				// Clear list if SP
+  unit= u;
   row_count= 0;
+
   if (var_list.elements != list.elements)
   {
     my_error(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT, MYF(0));
     return 1;
   }
-  unit=u;
   while ((item=li++))
   {
-    mv=gl++;
-    ls= &mv->s;
+    my_var *mv= gl++;
     if (mv->local)
-    {
       (void)local_vars.push_back(new Item_splocal(mv->offset));
-    }
     else
     {
-      Item_func_set_user_var *xx = new Item_func_set_user_var(*ls,item);
-      xx->fix_fields(thd,(TABLE_LIST*) thd->lex->select_lex.table_list.first,&item);
+      Item_func_set_user_var *xx = new Item_func_set_user_var(mv->s, item);
+      xx->fix_fields(thd, (TABLE_LIST*) thd->lex->select_lex.table_list.first,
+		     &item);
       xx->fix_length_and_dec();
       vars.push_back(xx);
     }
@@ -1105,6 +1103,7 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
   return 0;
 }
 
+
 bool select_dumpvar::send_data(List<Item> &items)
 {
   List_iterator_fast<Item_func_set_user_var> li(vars);