diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-30 16:42:46 +0400 |
| commit | 003cb2f42477772ae43228c0bc0f8492246b9340 (patch) | |
| tree | 680314d232d55b5a41dc2b2f5b500677e4aff183 /sql/item_row.h | |
| parent | 84ed288f6807a4602e0af8615bfb17080df15160 (diff) | |
| parent | 58e0dcb93dc2b2bf49f76c754bd216dbdf875a0d (diff) | |
| download | mariadb-git-003cb2f42477772ae43228c0bc0f8492246b9340.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/item_row.h')
| -rw-r--r-- | sql/item_row.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/item_row.h b/sql/item_row.h index 9c92e19caab..83e9743fede 100644 --- a/sql/item_row.h +++ b/sql/item_row.h @@ -47,13 +47,10 @@ public: Item_row(THD *thd, List<Item> &list): Item(thd), Item_args(thd, list), not_null_tables_cache(0), with_null(0) { } - Item_row(THD *thd, Item_row *item): - Item(thd), - Item_args(item), - Used_tables_and_const_cache(item), - not_null_tables_cache(0), - with_null(0) - {} + Item_row(THD *thd, Item_row *row): + Item(thd), Item_args(thd, static_cast<Item_args*>(row)), Used_tables_and_const_cache(), + not_null_tables_cache(0), with_null(0) + { } enum Type type() const { return ROW_ITEM; }; const Type_handler *type_handler() const { return &type_handler_row; } |