diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-11 20:51:09 +0200 |
| commit | 7ae555c1148f190f91d00499c2541fe7c2d4f555 (patch) | |
| tree | 861c0054243efee45b7a4b72135f897afc8972ba /sql/sql_select.cc | |
| parent | b9631e310b7cadf8711eef643e432d7e816680b4 (diff) | |
| parent | 754e7eff2872995e2b6e62f9da7448587a411c7b (diff) | |
| download | mariadb-git-7ae555c1148f190f91d00499c2541fe7c2d4f555.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
80% reverted
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 121805dd0e2..8c994964d59 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14833,6 +14833,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, case Item::VARBIN_ITEM: case Item::CACHE_ITEM: case Item::EXPR_CACHE_ITEM: + case Item::PARAM_ITEM: if (make_copy_field) { DBUG_ASSERT(((Item_result_field*)item)->result_field); |