Commit 6d3e14a1 authored by unknown's avatar unknown
Browse files

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

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

parents 6875cf36 9de6a750
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);  
}