From 9182079c5ff5081f6889a765e16a102610a77863 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 25 Apr 2011 17:22:25 +0200
Subject: lots of post-merge changes

---
 client/mysql.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/mysql.cc')

diff --git a/client/mysql.cc b/client/mysql.cc
index 208b5b3288c..d0c35e63536 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -4327,7 +4327,7 @@ extern "C" char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
     s= get_tty_password("");
     strnmov(buf, s, buf_len);
     buf[buf_len-1]= 0;
-    my_free(s, MYF(0));
+    my_free(s);
   }
   else
   {
-- 
cgit v1.2.1