diff options
| author | unknown <tnurnberg@mysql.com> | 2006-04-20 16:17:36 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com> | 2006-04-20 16:17:36 +0200 |
| commit | 1f3d54b4775783778694c804c1ee50c5d98983c3 (patch) | |
| tree | fa382eaa11901bea7dca93c4fd4b8feed781197f /sql | |
| parent | f5b0b1c3a8767c72029c5b8f7169f1e65d0e7a2a (diff) | |
| parent | 67aca614ba7c9ccacf5e9dd061a27f5d6ed8f992 (diff) | |
| download | mariadb-git-1f3d54b4775783778694c804c1ee50c5d98983c3.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/mysql-5.0-maint
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 2b5a3d1f38d..4b063fdb5e6 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1103,7 +1103,7 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root, /* 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); |