merging fix

a155d1f9 · holyfoot/hf@mysql.com/hfmain.(none) · c571b6e0 · a155d1f9
Commit a155d1f9 authored Jun 06, 2007 by holyfoot/hf@mysql.com/hfmain.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_table.cc sql/sql_table.cc +1 -1

No files found.
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1262,7 +1262,7 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags)
        {
          share->partition_info_buffer_size= syntax_len+1;
          if (!(share->partition_info=
-                  alloc_root(&share->mem_root, syntax_len+1)))
+                  (char*) alloc_root(&share->mem_root, syntax_len+1)))
            DBUG_RETURN(TRUE);

        }