diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
| commit | c498250888ec126fddda2867d1239b2a7734482f (patch) | |
| tree | e308174c977c0981d8e36f6f9b791b1b266d0cb0 /sql/sql_lex.cc | |
| parent | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (diff) | |
| parent | 1418439d3823fe059b41092af72ab32d5e7cd7ab (diff) | |
| download | mariadb-git-10.6-vatu.tar.gz | |
Merge 10.5 into 10.6mariadb-10.5.7bb-10.6-georg10.6-vatu
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); |