summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authoranozdrin/alik@quad. <>2008-02-26 19:34:02 +0300
committeranozdrin/alik@quad. <>2008-02-26 19:34:02 +0300
commitbdc83bf2cb5d457bbf25e5c6cc7e8d20176fd211 (patch)
tree4f6c2940e96b98c7499c2146e93e3ff920aed282 /sql/sql_connect.cc
parent45442d08d4df211a4f42b6f8437dba4014b39759 (diff)
parentaeebdfcfaa9dbcad63de40cc28d24c3f6156afca (diff)
downloadmariadb-git-bdc83bf2cb5d457bbf25e5c6cc7e8d20176fd211.tar.gz
Merge quad.:/mnt/raid/alik/MySQL/devel/5.1
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index c3541cb4eb4..b22a33e3e92 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -319,7 +319,7 @@ check_user(THD *thd, enum enum_server_command command,
if (mysql_change_db(thd, &db_str, FALSE))
DBUG_RETURN(1);
}
- send_ok(thd);
+ my_ok(thd);
DBUG_RETURN(0);
#else
@@ -468,7 +468,7 @@ check_user(THD *thd, enum enum_server_command command,
DBUG_RETURN(1);
}
}
- send_ok(thd);
+ my_ok(thd);
thd->password= test(passwd_len); // remember for error messages
/* Ready to handle queries */
DBUG_RETURN(0);