diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-23 07:14:51 +0200 |
| commit | 73985d83014e2a484dffac135193a2f0cf715b54 (patch) | |
| tree | 7167799ebc178519babd7000c76234665a9d6030 /sql/unireg.cc | |
| parent | 496532b5c54d69e012f6fc2417e97d61465588f2 (diff) | |
| parent | aade6e53d398dd287ca7e771191c9975099b4fa1 (diff) | |
| download | mariadb-git-73985d83014e2a484dffac135193a2f0cf715b54.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 14c51a0de91..7b67a07d9a6 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -312,7 +312,8 @@ LEX_CUSTRING build_frm_image(THD *thd, const char *table, pos+= reclength; int2store(pos, create_info->connect_string.length); pos+= 2; - memcpy(pos, create_info->connect_string.str, create_info->connect_string.length); + if (create_info->connect_string.length) + memcpy(pos, create_info->connect_string.str, create_info->connect_string.length); pos+= create_info->connect_string.length; int2store(pos, str_db_type.length); pos+= 2; |