summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2007-08-30 00:06:29 +0200
committerunknown <kent@kent-amd64.(none)>2007-08-30 00:06:29 +0200
commit3e22e3cac80b9d0e2a8cb79161b00b011cb190c5 (patch)
treee5c2638c5b8d55229af3b21edb9da6dd34f8190c /libmysql
parentf5536380a31b879851d65617694a3797e3431f90 (diff)
parent47874b60912833b5d0179aac6c22175966f8767d (diff)
downloadmariadb-git-3e22e3cac80b9d0e2a8cb79161b00b011cb190c5.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index c8e2d48873f..5f80e8b546b 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4677,6 +4677,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
MYSQL_DATA *result= &stmt->result;
MYSQL_ROWS *cur, **prev_ptr= &result->data;
NET *net;
+ DBUG_ENTER("cli_read_binary_rows");
if (!mysql)
{
@@ -4684,8 +4685,6 @@ int cli_read_binary_rows(MYSQL_STMT *stmt)
return 1;
}
- DBUG_ENTER("cli_read_binary_rows");
-
net = &mysql->net;
mysql= mysql->last_used_con;