diff options
| author | unknown <gshchepa@bk-internal.mysql.com> | 2007-08-23 21:38:24 +0200 |
|---|---|---|
| committer | unknown <gshchepa@bk-internal.mysql.com> | 2007-08-23 21:38:24 +0200 |
| commit | 30f5bb9ec855648632f0c39af7f78dc22a24673c (patch) | |
| tree | a0b303e785424c3fcef2d119a9160f0c463fb6b2 /libmysql/libmysql.c | |
| parent | 7dd4e789586bef5141e1a1d4da4b7efc271708aa (diff) | |
| parent | 43ab87e0d3bbb0c785951d126b7bab765ec3a929 (diff) | |
| download | mariadb-git-30f5bb9ec855648632f0c39af7f78dc22a24673c.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index b2f59ba2a5a..95ac45f40c4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4673,9 +4673,17 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) MYSQL *mysql= stmt->mysql; MYSQL_DATA *result= &stmt->result; MYSQL_ROWS *cur, **prev_ptr= &result->data; - NET *net = &mysql->net; + NET *net; + + if (!mysql) + { + set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); + return 1; + } + DBUG_ENTER("cli_read_binary_rows"); + net = &mysql->net; mysql= mysql->last_used_con; while ((pkt_len= cli_safe_read(mysql)) != packet_error) |