Merge mysql.com:/home/mydev/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-bug6151

Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug6151
6d3e14a1 · unknown · 6875cf36 · 9de6a750 · 6d3e14a1
Commit 6d3e14a1 authored Oct 20, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/handler.cc sql/handler.cc +1 -1

No files found.
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1325,7 +1325,7 @@ int ha_create_table_from_engine(THD* thd,
  }

 err_end:
-  my_free((char*) frmblob, MYF(MY_ALLOW_ZERO));
+  my_free((char*) frmblob, MYF(MY_ALLOW_ZERO_PTR));
  DBUG_RETURN(error);  
 }