summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-08-29 22:29:58 +0200
committerkent@kent-amd64.(none) <>2007-08-29 22:29:58 +0200
commitecbff1245713978c97706335eaa9b35fd1599b3b (patch)
tree43e88dee27a1a85349550524f88b235a5bfeda40 /libmysql
parent783411911af08a805212be5fe17aa9789374e099 (diff)
parentedf772aef14ca100e4f3bea21c46948cf5da25c3 (diff)
downloadmariadb-git-ecbff1245713978c97706335eaa9b35fd1599b3b.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-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;