diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 14:53:18 +0200 |
| commit | e0a1c745ec3ed1ec6c0375a2a624697c29f480a6 (patch) | |
| tree | 24ded2c6ebe3ea3413ce56af89ea0f2f63bb3a39 /sql/item_row.h | |
| parent | 4ec88ea9c3ec52d996b39167d12a61ab95fdeacc (diff) | |
| parent | 2aa51f528fd5d23cc54eca8fbd07e88e7b2993c7 (diff) | |
| download | mariadb-git-e0a1c745ec3ed1ec6c0375a2a624697c29f480a6.tar.gz | |
Merge branch '10.1' into 10.2
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 cd58e15fe8b..d7326df04ce 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; }; void illegal_method_call(const char *); |