diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-22 18:49:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-23 10:54:35 +0100 |
| commit | 216b5cc9b6434d501f9aaee9716f5b2983ba38c8 (patch) | |
| tree | 8b51ddaff296aa7cd2d85e31ce024f6acc3e6100 | |
| parent | e6d51aac778f7c59b0f737f7504a52b0baf07544 (diff) | |
| download | mariadb-git-216b5cc9b6434d501f9aaee9716f5b2983ba38c8.tar.gz | |
MDEV-9606 Server crashes in fix_fields, main.null fails with ps-protocol #2
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d7e5eb597cc..b4de622f00a 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2708,7 +2708,8 @@ Item_func_nullif::fix_length_and_dec() m_cache->setup(current_thd, args[0]); m_cache->store(args[0]); m_cache->set_used_tables(args[0]->used_tables()); - args[0]= args[2]= m_cache; + thd->change_item_tree(&args[0], m_cache); + thd->change_item_tree(&args[2], m_cache); } set_handler_by_field_type(args[2]->field_type()); collation.set(args[2]->collation); |