Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_analyse.cc:
  Auto merged

sql/sql_analyse.cc

@@ -324,7 +324,7 @@ void field_str::add()
       }
       else
       {
-	bzero((char*) &s, sizeof(s));  // Let tree handle free of this
+//	bzero((char*) &s, sizeof(s));  // Let tree handle free of this
 	if ((treemem += length) > pc->max_treemem)
 	{
 	  room_in_tree = 0;	 // Remove tree, too big tree

sql/sql_select.cc

@@ -733,6 +733,8 @@ JOIN::exec()
 				  HA_POS_ERROR : unit->select_limit_cnt,
 				  0))))
       order=0;
+    if (procedure)
+      (void)result->prepare(fields_list, unit);
     select_describe(this, need_tmp,
 		    order != 0 && !skip_sort_order,
 		    select_distinct);