summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-12 14:41:51 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-12 14:41:51 +0200
commit0a20e5ab77f8a6532b41ea2518626397059ccf42 (patch)
tree1ef90ec718bc16d80ca65eb89537f697e1482f09 /sql/item.cc
parente0f9540bcc6ab1618b6fd475f02e019401c4c295 (diff)
parentbeec9c0e19284a0e50d3629f4cb2486007b0333b (diff)
downloadmariadb-git-0a20e5ab77f8a6532b41ea2518626397059ccf42.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 2a5e7253cbd..d1d1c349eed 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -10318,6 +10318,8 @@ bool Item_cache_str::cache_value()
value_buff.copy(*value);
value= &value_buff;
}
+ else
+ value_buff.copy();
return TRUE;
}