diff options
author | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2010-11-23 23:39:59 +0200 |
commit | 9d0abe79c6dfd173c299bc7d29293124a4b66b0b (patch) | |
tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/sql_load.cc | |
parent | 6d0edb8e92a6e7b5d636fdc9b39bd2affe4cb579 (diff) | |
parent | 8057c3c943ccf92409144d0efbbf53bd6ee40f64 (diff) | |
download | mariadb-git-9d0abe79c6dfd173c299bc7d29293124a4b66b0b.tar.gz |
Merge with MySQL 5.1.52
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 366c01b1754..a909335bfa7 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1147,7 +1147,7 @@ READ_INFO::~READ_INFO() if (need_end_io_cache) ::end_io_cache(&cache); } - my_free((uchar*) buffer,MYF(MY_ALLOW_ZERO_PTR)); + my_free(buffer, MYF(MY_ALLOW_ZERO_PTR)); } |