diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-13 17:30:37 +0200 |
| commit | 8fa759a5762733d9f8a4050437fadcd255ecd1a2 (patch) | |
| tree | 093c167478abbbf6f51cd47f8df8651ee17f97f1 /sql/item.cc | |
| parent | 014e1258309da2475b8ae36d445261f87422adaf (diff) | |
| parent | 3466b47b0d2f0aca0a2191574c593c7eaea0b0b8 (diff) | |
| download | mariadb-git-8fa759a5762733d9f8a4050437fadcd255ecd1a2.tar.gz | |
Merge 10.3 into 10.4
We disable the MDEV-21189 test galera.galera_partition
because it times out.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 925d44a481f..dc39755f63d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -10108,6 +10108,8 @@ bool Item_cache_str::cache_value() value_buff.copy(*value); value= &value_buff; } + else + value_buff.copy(); return TRUE; } |