diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:57:45 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-09-28 10:57:45 -0600 |
| commit | b76788a942d0cdc22dd7bd632ffc81dff645f6d8 (patch) | |
| tree | 7029fc8d92228e142a9bdfefcb9626ed85ad227c /libmysql | |
| parent | d7e230e1fc987ae9c175512d66b33d5c1642f9a8 (diff) | |
| parent | ba0cd51eb19f1f8868901d4b2327e1c8f4745c19 (diff) | |
| download | mariadb-git-b76788a942d0cdc22dd7bd632ffc81dff645f6d8.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
libmysql/libmysql.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
configure.in:
Use local (manual merge)
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 7c8fe04f36d..8ccf7b7d5e2 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4692,7 +4692,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) NET *net; DBUG_ENTER("cli_read_binary_rows"); - + if (!mysql) { set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate); |