diff options
author | df@pippilotta.erinye.com <> | 2007-09-04 10:54:32 +0200 |
---|---|---|
committer | df@pippilotta.erinye.com <> | 2007-09-04 10:54:32 +0200 |
commit | ab791bc13d3b46000f8bfc06299f79688d6ebb9a (patch) | |
tree | d1bc1003f8d381da2a66dbf48a4a838fb5762068 /libmysql | |
parent | 948cbc736c277ed74f4037af2614191dc953a78b (diff) | |
parent | 59b504a5e34a087952127b8473fa9d3cb81098c0 (diff) | |
download | mariadb-git-ab791bc13d3b46000f8bfc06299f79688d6ebb9a.tar.gz |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c8e2d48873f..6b9284e7802 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4677,15 +4677,16 @@ 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"); + DBUG_ENTER("cli_read_binary_rows"); + if (!mysql) { set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); - return 1; + DBUG_RETURN(1); } - DBUG_ENTER("cli_read_binary_rows"); - net = &mysql->net; mysql= mysql->last_used_con; |