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 | b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083 (patch) | |
| tree | 6068b9d90b4127b1c3608e29913fa82bf1a1f20e /sql/sql_load.cc | |
| parent | 7840965db9460e2117c163f3db83aaa247c65203 (diff) | |
| parent | 498ee6bd19eabc85dcbd9abebc9cf6aeb79d1985 (diff) | |
| download | mariadb-git-b52020221e8b4e58d1bc6dd5a5a6f065a6a3a083.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)); } |