bk commit into 5.0 tree (jimw:1.1977) BUG#11213

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1977 05/06/22 11:02:44 jimw@stripped +2 -0
  Change error message when the amount of stack needed is not available
  to include how much stack space we need. (Bug #11213)

  sql/sql_parse.cc
    1.456 05/06/22 11:02:41 jimw@stripped +3 -2
    Use new ER_STACK_OVERRUN_NEED_MORE, which includes information on
    how much room we need on the stack.

  sql/share/errmsg.txt
    1.35 05/06/22 11:02:40 jimw@stripped +2 -0
    Add new error message

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-11213

--- 1.455/sql/sql_parse.cc	2005-06-17 12:26:19 -07:00
+++ 1.456/sql/sql_parse.cc	2005-06-22 11:02:41 -07:00
@@ -5094,8 +5094,9 @@
   if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >=
       (long) (thread_stack - margin))
   {
-    sprintf(errbuff[0],ER(ER_STACK_OVERRUN),stack_used,thread_stack);
-    my_message(ER_STACK_OVERRUN,errbuff[0],MYF(0));
+    sprintf(errbuff[0],ER(ER_STACK_OVERRUN_NEED_MORE),
+            stack_used,thread_stack,margin);
+    my_message(ER_STACK_OVERRUN_NEED_MORE,errbuff[0],MYF(0));
     thd->fatal_error();
     return 1;
   }

--- 1.34/sql/share/errmsg.txt	2005-06-20 04:38:09 -07:00
+++ 1.35/sql/share/errmsg.txt	2005-06-22 11:02:40 -07:00
@@ -5358,3 +5358,5 @@
 	eng "The statement (%lu) has no open cursor."
 ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
         eng "Explicit or implicit commit is not allowed in stored function or trigger."
+ER_STACK_OVERRUN_NEED_MORE
+	eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld -O thread_stack=#' to specify a bigger stack."