diff options
| author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-20 22:46:52 +0200 |
| commit | 886965303155d1c2fbd90e3606fd192d4ba7741b (patch) | |
| tree | 352c3fca9ea50d4ca34dacb71d6f6ec2a89df543 /sql/net_serv.cc | |
| parent | daaddeb656c26c685962fef69d19e7f264620e2b (diff) | |
| parent | 14decc4fbc04b8ce0c5efb7d76b711c6e60a0266 (diff) | |
| download | mariadb-git-886965303155d1c2fbd90e3606fd192d4ba7741b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
mysql-test/t/ctype_ucs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 1601f7e5177..e84b2266e82 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -810,7 +810,7 @@ my_real_read(NET *net, ulong *complen) { my_bool interrupted = vio_should_retry(net->vio); - DBUG_PRINT("info",("vio_read returned %d, errno: %d", + DBUG_PRINT("info",("vio_read returned %ld, errno: %d", length, vio_errno(net->vio))); #if (!defined(__WIN__) && !defined(__EMX__) && !defined(OS2)) || defined(MYSQL_SERVER) /* |