Commit 1f4afa38 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-11213 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
parents 7bb359cd 5629af17

sql/share/errmsg.txt

+2 −0
Original line number Diff line number Diff line
@@ -5384,3 +5384,5 @@ ER_CANT_CREATE_FEDERATED_TABLE 
	eng "Can't create federated table. Foreign data src error : '%-.64s'"

ER_TRG_IN_WRONG_SCHEMA  

	eng "Trigger in wrong schema"

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."

sql/sql_parse.cc

+3 −2
Original line number Diff line number Diff line
@@ -5087,8 +5087,9 @@ bool check_stack_overrun(THD *thd, long margin, 
  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;

  }