diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
| commit | 2d52d3c1bf46d2d5123ee986fff94858899cdf33 (patch) | |
| tree | 31b0004b988f6169bd7f703a66f8ddc3189d332f /sql/item.cc | |
| parent | 8aff418ec867419950bc2e0010f679b8f0216829 (diff) | |
| parent | 946d9e4db4896992400cabbd0d1db9a0a10cbfd1 (diff) | |
| download | mariadb-git-2d52d3c1bf46d2d5123ee986fff94858899cdf33.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 332e027adf1..576dce78299 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2017, MariaDB Corporation + Copyright (c) 2010, 2018, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -8492,7 +8492,7 @@ Item *Item_default_value::transform(Item_transformer transformer, uchar *args) bool Item_insert_value::eq(const Item *item, bool binary_cmp) const { return item->type() == INSERT_VALUE_ITEM && - ((Item_default_value *)item)->arg->eq(arg, binary_cmp); + ((Item_insert_value *)item)->arg->eq(arg, binary_cmp); } |