diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-29 21:12:54 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-29 21:12:54 +0500 |
| commit | 11816452bc097c3e5273137a1d012a321e12a9c1 (patch) | |
| tree | 4a641e71d691ad6cde5ec2ea7d9e73600139c49f | |
| parent | a0a216bb407bdc6e7cc10c61202111515d81ed82 (diff) | |
| download | mariadb-git-11816452bc097c3e5273137a1d012a321e12a9c1.tar.gz | |
sp_head.cc:
Post-merge fix.
sql/sp_head.cc:
Post-merge fix.
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d08d1dd3930..74714a42591 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -958,7 +958,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str) query_cache_send_result_to_client function. */ buf_len= qbuf.length() + thd->db_length + 1 + QUERY_CACHE_FLAGS_SIZE + 1; - if ((pbuf= alloc_root(thd->mem_root, buf_len))) + if ((pbuf= (char *) alloc_root(thd->mem_root, buf_len))) { memcpy(pbuf, qbuf.ptr(), qbuf.length()); pbuf[qbuf.length()]= 0; |