diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 08:28:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 08:28:39 +0300 |
| commit | 3a79e5fd317316c293baa459e8296fdb0744c280 (patch) | |
| tree | 9ff2059bbd651715daa6a1d7241c0ddd303c0071 /sql/sql_string.cc | |
| parent | 7948a1dc53eccc23095a83daa5fd6b3bfaedf7f2 (diff) | |
| parent | 657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (diff) | |
| download | mariadb-git-3a79e5fd317316c293baa459e8296fdb0744c280.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index e3f4497274c..560815eeb6b 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2016, 2020, MariaDB + Copyright (c) 2016, 2021, MariaDB 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 @@ -438,8 +438,8 @@ bool String::copy(const char *str, size_t arg_length, { uint32 offset; - DBUG_ASSERT(!str || str != Ptr); - + DBUG_ASSERT(!str || str != Ptr || !is_alloced()); + if (!needs_conversion(arg_length, from_cs, to_cs, &offset)) { *errors= 0; |