diff options
| author | unknown <ingo@mysql.com> | 2004-10-20 13:54:55 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-10-20 13:54:55 +0200 |
| commit | 6d3e14a1c62f920674214becd8278ab51bf83911 (patch) | |
| tree | 3be68649a46d403cbe7d2e9d020c370fab038f2b /sql | |
| parent | 6875cf36d1625449f539c9eaefb8171158231ee2 (diff) | |
| parent | 9de6a750f0cb59089a943b1b4c57b189dcbc6368 (diff) | |
| download | mariadb-git-6d3e14a1c62f920674214becd8278ab51bf83911.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug6151
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 0e3153b09d6..cecf5689464 100644 --- 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); } |