summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-06 11:29:44 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-06 11:29:44 +0200
commit38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch)
treeb33dfb00e00ec3f4473c088305871021f437ee46 /sql/protocol.h
parent623ed1946215e25682847ac3b0ea066cab35ea59 (diff)
parent052c9e392e6d9b770511c88cfec05ef606bff2ed (diff)
downloadmariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index f661c7663e5..1c86c6d6c49 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -204,7 +204,6 @@ public:
void send_warning(THD *thd, uint sql_errno, const char *err=0);
bool net_send_error(THD *thd, uint sql_errno, const char *err,
const char* sqlstate);
-bool send_old_password_request(THD *thd);
uchar *net_store_data(uchar *to,const uchar *from, size_t length);
uchar *net_store_data(uchar *to,int32 from);
uchar *net_store_data(uchar *to,longlong from);