diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
commit | 711c318c072f6d5fd5c2877ccc736c7673d1711d (patch) | |
tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /sql/sql_manager.cc | |
parent | 00538253b592522babe3609af29cb3eb87218b64 (diff) | |
parent | fd64a0db45705ca5eb2ad34ffc2ed1d9ef961017 (diff) | |
download | mariadb-git-711c318c072f6d5fd5c2877ccc736c7673d1711d.tar.gz |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_manager.cc')
-rw-r--r-- | sql/sql_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_manager.cc b/sql/sql_manager.cc index 2189b1e124f..e3929066361 100644 --- a/sql/sql_manager.cc +++ b/sql/sql_manager.cc @@ -117,7 +117,7 @@ pthread_handler_t handle_manager(void *arg __attribute__((unused))) { struct handler_cb *next= cb->next; cb->action(); - my_free((uchar*)cb, MYF(0)); + my_free(cb); cb= next; } } |