diff options
| author | unknown <serg@janus.mylan> | 2006-10-13 11:43:33 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2006-10-13 11:43:33 +0200 |
| commit | 67a2b7cf298d0a351256ab13c2577c32e20bd723 (patch) | |
| tree | ba0eb1eef3749ba0752df03beef0f6f83cde973c /sql/sql_parse.cc | |
| parent | 0a1dc8af5b665647a08c51f75b5d5c2e1a112d99 (diff) | |
| parent | c2872bafde6d6ec2444c293f7a8aa397eb1dbb59 (diff) | |
| download | mariadb-git-67a2b7cf298d0a351256ab13c2577c32e20bd723.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
unittest/Makefile.am:
Auto merged
unittest/mysys/my_atomic-t.c:
merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index fc7ed7ff673..76554f2ae79 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5762,10 +5762,10 @@ bool check_stack_overrun(THD *thd, long margin, long stack_used; DBUG_ASSERT(thd == current_thd); if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >= - (long) (thread_stack - margin)) + (long) (my_thread_stack_size - margin)) { sprintf(errbuff[0],ER(ER_STACK_OVERRUN_NEED_MORE), - stack_used,thread_stack,margin); + stack_used,my_thread_stack_size,margin); my_message(ER_STACK_OVERRUN_NEED_MORE,errbuff[0],MYF(0)); thd->fatal_error(); return 1; |