diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-04-21 10:04:04 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-04-21 10:05:50 +0200 |
| commit | 6f6c74b0d18d5d4fa8a112a6793653ef5242726d (patch) | |
| tree | 0410c1f500341283233dbb9cb39511aab9baf123 /sql/sql_class.h | |
| parent | 4730314a70119ae5857edffe2d1bec86960ef22b (diff) | |
| parent | 5ba77222e9fe7af8ff403816b5338b18b342053c (diff) | |
| download | mariadb-git-6f6c74b0d18d5d4fa8a112a6793653ef5242726d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 8268ebe0bcd..b4428714c28 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1005,7 +1005,7 @@ public: /* We build without RTTI, so dynamic_cast can't be used. */ enum Type { - STATEMENT, PREPARED_STATEMENT, STORED_PROCEDURE, TABLE_ARENA + STATEMENT, PREPARED_STATEMENT, STORED_PROCEDURE }; Query_arena(MEM_ROOT *mem_root_arg, enum enum_state state_arg) : @@ -3946,8 +3946,7 @@ public: bool is_item_tree_change_register_required() { - return !stmt_arena->is_conventional() - || stmt_arena->type() == Query_arena::TABLE_ARENA; + return !stmt_arena->is_conventional(); } void change_item_tree(Item **place, Item *new_value) |