diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
| commit | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (patch) | |
| tree | 051a721f7ea77c2278d09323e36088abe22aa66a /sql/item_row.h | |
| parent | d11af09865299033d5eef64531704f6ab8af5304 (diff) | |
| parent | 2eb3c5e5420a724945a4cba914df25aa1e3744ce (diff) | |
| download | mariadb-git-9d2e2d753323a934604d25144b9d1ecaf34b47d8.tar.gz | |
Merge branch '10.0' into 10.1
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 25c9ec7915b..640f27bfa1f 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 *); |