diff options
| author | msvensson@shellback.(none) <> | 2006-04-27 17:35:29 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-04-27 17:35:29 +0200 |
| commit | e5004d13126c617be159bc29b7bb7fd41c466659 (patch) | |
| tree | 351430ff19617a6fb1bf20f82fc7bbb668d4c6ba /sql/sql_base.cc | |
| parent | 46ee4ea0dffdeb4121fc34de3f930fb29276866b (diff) | |
| parent | 0e5113aead49dd97f20c062c817f7ef2ffee9693 (diff) | |
| download | mariadb-git-e5004d13126c617be159bc29b7bb7fd41c466659.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/sql_base.cc')
| -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 16a6768da7a..482a25acbd2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1187,7 +1187,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); |