diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-07-13 10:39:24 +0200 |
| commit | f45523188e57575eeed5f7fbe8fbefc06de4b6f3 (patch) | |
| tree | 74d63cef81d432cda2315d47976755590872f3bd /sql/mdl.cc | |
| parent | 7f0f32d659c5e3eff1d6ed6249cad59ff6df5723 (diff) | |
| parent | 071636d6fa25909510e3d222d2ed1d919625f55d (diff) | |
| download | mariadb-git-f45523188e57575eeed5f7fbe8fbefc06de4b6f3.tar.gz | |
merge from mysql-trunk-bugfixing
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 631d8f52b5f..c5b84902823 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -1953,7 +1953,7 @@ bool MDL_context::acquire_locks(MDL_request_list *mdl_requests, if (acquire_lock(*p_req, lock_wait_timeout)) goto err; } - my_free(sort_buf, MYF(0)); + my_free(sort_buf); return FALSE; err: @@ -1969,7 +1969,7 @@ err: { (*p_req)->ticket= NULL; } - my_free(sort_buf, MYF(0)); + my_free(sort_buf); return TRUE; } |