merge commit

This commit is contained in:
kostja@oak.local 2003-07-31 15:47:00 +04:00
parent 715f8747d4
commit ce691c7c61

View File

@ -1878,7 +1878,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
{ {
/* /*
By sending this very specific reply server asks us to send scrambled By sending this very specific reply server asks us to send scrambled
password in old format. The reply contains scramble_323. password in old format.
*/ */
scramble_323(buff, mysql->scramble, passwd); scramble_323(buff, mysql->scramble, passwd);
if (my_net_write(net, buff, SCRAMBLE_LENGTH_323 + 1) || net_flush(net)) if (my_net_write(net, buff, SCRAMBLE_LENGTH_323 + 1) || net_flush(net))