diff options
| author | Evgeny Potemkin <epotemkin@mysql.com> | 2009-12-02 16:49:21 +0300 |
|---|---|---|
| committer | Evgeny Potemkin <epotemkin@mysql.com> | 2009-12-02 16:49:21 +0300 |
| commit | 1eda9dc777efe7d2e6db05460ab00b67ad3d7e41 (patch) | |
| tree | e141eed482706ba08b9c6f03957e908c35020e2a /sql/sql_base.cc | |
| parent | d7abca9ac38fc36eb3ff7f96409c0cabe5f5c03e (diff) | |
| parent | d969cbc5783a88406428a94ae4a01036e742178c (diff) | |
| download | mariadb-git-1eda9dc777efe7d2e6db05460ab00b67ad3d7e41.tar.gz | |
Auto-merged.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index cf8a0b32764..9bb4ebedd55 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5686,7 +5686,8 @@ find_field_in_view(THD *thd, TABLE_LIST *table_list, if (!my_strcasecmp(system_charset_info, field_it.name(), name)) { // in PS use own arena or data will be freed after prepare - if (register_tree_change && thd->stmt_arena->is_stmt_prepare_or_first_sp_execute()) + if (register_tree_change && + thd->stmt_arena->is_stmt_prepare_or_first_stmt_execute()) arena= thd->activate_stmt_arena_if_needed(&backup); /* create_item() may, or may not create a new Item, depending on |