Merge fix for DDL handling

37b3d944 · Seppo Jaakola · a0c86794 · 37b3d944
Commit 37b3d944 authored Oct 11, 2013 by Seppo Jaakola
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/wsrep_mysqld.cc sql/wsrep_mysqld.cc +2 -1

No files found.
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -898,7 +898,8 @@ static bool wsrep_prepare_keys_for_isolation(THD*              thd,
        {
            wsrep_key_t* tmp;
            tmp= (wsrep_key_t*)my_realloc(
-                ka->keys, (ka->keys_len + 1) * sizeof(wsrep_key_t), MYF(0));
+       	        ka->keys, (ka->keys_len + 1) * sizeof(wsrep_key_t), 
+                MYF(MY_ALLOW_ZERO_PTR));
            if (!tmp)
            {
                sql_print_error("Can't allocate memory for key_array");