sql/net_serv.cc · 57e53898f74f765dd32c4f05bf4aa32d60439f72 · nexedi / MariaDB

Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. · 57e53898

Alexey Kopytov authored May 07, 2010

Conflicts:

Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/t/explain.test
Text conflict in sql/net_serv.cc
Text conflict in sql/sp_head.cc
Text conflict in sql/sql_priv.h

57e53898

net_serv.cc 32 KB

Replace net_serv.cc