Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/data0/bk/mysql-5.0-maint


sql/sp_head.cc:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index ef2f895c8b2..2a486e3f93d 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -565,7 +565,7 @@ create_typelib(MEM_ROOT *mem_root, create_field *field_def, List<String> *src)
     result->name= "";
     if (!(result->type_names=(const char **)
           alloc_root(mem_root,(sizeof(char *)+sizeof(int))*(result->count+1))))
-      return 0;
+      DBUG_RETURN(0);
     result->type_lengths= (unsigned int *)(result->type_names + result->count+1);
     List_iterator<String> it(*src);
     String conv;
@@ -599,7 +599,7 @@ create_typelib(MEM_ROOT *mem_root, create_field *field_def, List<String> *src)
     result->type_names[result->count]= 0;
     result->type_lengths[result->count]= 0;
   }
-  return result;
+  DBUG_RETURN(result);
 }