Commit abe41c55 authored by unknown's avatar unknown

Bug#19262: internal function create_typelib() uses DBUG_ENTER() but not DBUG_RETURN

Trivial replacement of return with DBUG_RETURN.


sql/sp_head.cc:
  Trivial replacement of return with DBUG_RETURN
parent 726351f5
...@@ -565,7 +565,7 @@ create_typelib(MEM_ROOT *mem_root, create_field *field_def, List<String> *src) ...@@ -565,7 +565,7 @@ create_typelib(MEM_ROOT *mem_root, create_field *field_def, List<String> *src)
result->name= ""; result->name= "";
if (!(result->type_names=(const char **) if (!(result->type_names=(const char **)
alloc_root(mem_root,(sizeof(char *)+sizeof(int))*(result->count+1)))) 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); result->type_lengths= (unsigned int *)(result->type_names + result->count+1);
List_iterator<String> it(*src); List_iterator<String> it(*src);
String conv; String conv;
...@@ -599,7 +599,7 @@ create_typelib(MEM_ROOT *mem_root, create_field *field_def, List<String> *src) ...@@ -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_names[result->count]= 0;
result->type_lengths[result->count]= 0; result->type_lengths[result->count]= 0;
} }
return result; DBUG_RETURN(result);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment