bk commit into 5.0 tree (tnurnberg:1.2166) BUG#18964

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of azundris. When azundris 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.2166 06/04/20 01:02:33 tnurnberg@stripped +1 -0
  Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
  
  fixlet corrects return to DBUG_RETURN to restore the balance.

  sql/sql_base.cc
    1.333 06/04/20 01:02:26 tnurnberg@stripped +1 -1
    DBUG_ENTER without DBUG_RETURN in open_table()

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/mysql-5.0-maint

--- 1.332/sql/sql_base.cc	2006-04-20 00:55:24 +02:00
+++ 1.333/sql/sql_base.cc	2006-04-20 01:02:26 +02:00
@@ -1103,7 +1103,7 @@
 
   /* an open table operation needs a lot of the stack space */
   if (check_stack_overrun(thd, STACK_MIN_SIZE_FOR_OPEN, (char *)&alias))
-    return 0;
+    DBUG_RETURN(0);
 
   if (thd->killed)
     DBUG_RETURN(0);