diff options
| author | unknown <konstantin@mysql.com> | 2005-07-01 15:50:32 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-01 15:50:32 +0400 |
| commit | dc22424bd9e7661ce9a3c32c8bbf0f0cdd7e09f6 (patch) | |
| tree | 4405d2b2b87633f7181f031c9457b4186c9951e7 /sql/sql_class.cc | |
| parent | 8ec6c354ab113342e1b6a0375aec1e05da8e1988 (diff) | |
| parent | d36c14f7488af415258b03b61e1e7dad74e1cdcb (diff) | |
| download | mariadb-git-dc22424bd9e7661ce9a3c32c8bbf0f0cdd7e09f6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-11172-new
sql/sql_class.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f5d45ca53f4..a941ba11943 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -784,7 +784,10 @@ void THD::nocheck_register_item_tree_change(Item **place, Item *old_value, void *change_mem= alloc_root(runtime_memroot, sizeof(*change)); if (change_mem == 0) { - fatal_error(); + /* + OOM, thd->fatal_error() is called by the error handler of the + memroot. Just return. + */ return; } change= new (change_mem) Item_change_record; |