diff options
| author | mkindahl@dl145h.mysql.com <> | 2008-01-30 16:14:14 +0100 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2008-01-30 16:14:14 +0100 |
| commit | 2a864d1fd74e9651be95a058c4ab9cd3457ae346 (patch) | |
| tree | c9b1db7cfc763396ac45fed931a526ddf538698a /sql-common | |
| parent | 59d027c6101527ca5e2a23946d057b41e7d24da6 (diff) | |
| parent | 219a75056aec9f2420909a7bf52e77fa4792f9dc (diff) | |
| download | mariadb-git-2a864d1fd74e9651be95a058c4ab9cd3457ae346.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 1a0f9c64d7d..a26207038cf 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2100,7 +2100,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, /* Check if version of protocol matches current one */ mysql->protocol_version= net->read_pos[0]; - DBUG_DUMP("packet",(char*) net->read_pos,10); + DBUG_DUMP("packet",(uchar*) net->read_pos,10); DBUG_PRINT("info",("mysql protocol version %d, server=%d", PROTOCOL_VERSION, mysql->protocol_version)); if (mysql->protocol_version != PROTOCOL_VERSION) @@ -2226,7 +2226,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, Send client_flag, max_packet_size - unencrypted otherwise the server does not know we want to do SSL */ - if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net)) + if (my_net_write(net, (uchar*) buff, (uint) (end-buff)) || net_flush(net)) { set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate, ER(CR_SERVER_LOST_EXTENDED), |