diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:47 +0200 |
| commit | 133b4b46fefde402542214d8226262534dc3601a (patch) | |
| tree | 51bbdc0ee35a4af61e5af6d97948963ae9354f39 /sql/sql_lex.cc | |
| parent | 44836bcd12e3974e79c928be747955bfb3b73910 (diff) | |
| parent | 533a13af069d8c9e6c5f4e1a72851497185ade03 (diff) | |
| download | mariadb-git-133b4b46fefde402542214d8226262534dc3601a.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 61e3b89c9a3..60a7a4f6ce0 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -10209,7 +10209,8 @@ bool LEX::new_sp_instr_stmt(THD *thd, qbuff.length= prefix.length + suffix.length; if (!(qbuff.str= (char*) alloc_root(thd->mem_root, qbuff.length + 1))) return true; - memcpy(qbuff.str, prefix.str, prefix.length); + if (prefix.length) + memcpy(qbuff.str, prefix.str, prefix.length); strmake(qbuff.str + prefix.length, suffix.str, suffix.length); i->m_query= qbuff; return sphead->add_instr(i); |