diff options
| -rw-r--r-- | sql/share/errmsg.txt | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index c2485daf0fa..459560ccac8 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -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." diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 23403e6e00a..23aa676c8fc 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; } |