diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
| commit | 4771ae4b22d2bdef0aafc563570c71d4636a2493 (patch) | |
| tree | d115bd7c68b1e6feab68ff6fcd547e0c86c79296 /sql/item.cc | |
| parent | 60f51af755ea9d07c20a596ba21de184816fa265 (diff) | |
| parent | 0c25e58db6b045df92c209d396031cac5b528bbf (diff) | |
| download | mariadb-git-4771ae4b22d2bdef0aafc563570c71d4636a2493.tar.gz | |
Merge branch 'github/10.1' into 10.2
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item.cc b/sql/item.cc index 7b4ab6debd0..a46c17a0dbb 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 @@ -9079,7 +9079,7 @@ bool Item_ignore_value::send(Protocol *protocol, String *buffer) 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); } @@ -10704,11 +10704,11 @@ const char *dbug_print_item(Item *item) ulonglong save_option_bits= thd->variables.option_bits; thd->variables.option_bits &= ~OPTION_QUOTE_SHOW_CREATE; - item->print(&str ,QT_EXPLAIN); + item->print(&str, QT_EXPLAIN); thd->variables.option_bits= save_option_bits; - if (str.c_ptr() == buf) + if (str.c_ptr_safe() == buf) return buf; else return "Couldn't fit into buffer"; |