diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-09-04 10:49:54 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-09-04 10:49:54 +0200 |
| commit | 0ec2e69d7fd96f30f1bd2346d8d799ffb4f09b81 (patch) | |
| tree | ed4f3e2a373d0a9ca392b8b6d11e98c1d9387d72 /libmysql | |
| parent | 3d491888b25b6c86af58e09fe96f680d2bcbe0c2 (diff) | |
| parent | e968129c6be506e9f7c3044bd8a942c28546e36c (diff) | |
| download | mariadb-git-0ec2e69d7fd96f30f1bd2346d8d799ffb4f09b81.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2bf899b63e3..422a23e5bff 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4682,10 +4682,12 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) 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); } net = &mysql->net; |