sp_head.cc:

Post-merge fix.

sp_head.cc:
Post-merge fix.
898a0fbf · gshchepa/uchum@gleb.loc · 538905f1 · 898a0fbf
Commit 898a0fbf authored Jul 29, 2007 by gshchepa/uchum@gleb.loc
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sp_head.cc sql/sp_head.cc +1 -1

No files found.
--- 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;