diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-15 14:50:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-01-23 13:42:41 +0100 |
| commit | ba8d0fa700a73893979793785ed53f7bbd950df8 (patch) | |
| tree | fcd00cf7e93d7b3449025a89d9687180961f66c5 /sql/item.cc | |
| parent | 11408a69adc6749c855a9867fc4db3e3d45236c3 (diff) | |
| download | mariadb-git-ba8d0fa700a73893979793785ed53f7bbd950df8.tar.gz | |
MDEV-14786: Server crashes in Item_cond::transform on 2nd execution of SP querying from a view
MDEV-14957: JOIN::prepare gets unusable "conds" as argument
Do not touch merged derived (it is irreversible)
Fix first argument of in_optimizer for calls possible before fix_fields()
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 576dce78299..08a00615c0c 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -10010,7 +10010,7 @@ const char *dbug_print_item(Item *item) if (!item) return "(Item*)NULL"; item->print(&str ,QT_ORDINARY); - if (str.c_ptr() == buf) + if (str.c_ptr_safe() == buf) return buf; else return "Couldn't fit into buffer"; |