diff options
| author | unknown <kostja@bodhi.local> | 2006-11-29 11:44:37 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-11-29 11:44:37 +0300 |
| commit | 6d1e66a3de34b1b7b71c73c550cd1d13f1db9dcd (patch) | |
| tree | f6410b9231112e66043c0eb7edc1b33fbff6e760 /sql/net_serv.cc | |
| parent | 774675a215bad1afdcf3c53e295536a217a70d00 (diff) | |
| parent | 79e7d778134f2c4bd358d84d85db1fe1f200624c (diff) | |
| download | mariadb-git-6d1e66a3de34b1b7b71c73c550cd1d13f1db9dcd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
libmysql/libmysql.c:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
server-tools/instance-manager/mysql_connection.cc:
Rollback Monty's removals of explicit casts
tests/mysql_client_test.c:
SCCS 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 a55fef5555c..ec4c4675e76 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -809,7 +809,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(MYSQL_SERVER) /* |