diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /libmysql | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 69fce429ab9..2be7c00b4a4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2131,7 +2131,14 @@ int cli_stmt_execute(MYSQL_STMT *stmt) DBUG_RETURN(1); } - net_clear(net, 1); /* Sets net->write_pos */ + if (net->vio) + net_clear(net, 1); /* Sets net->write_pos */ + else + { + set_stmt_errmsg(stmt, net); + DBUG_RETURN(1); + } + /* Reserve place for null-marker bytes */ null_count= (stmt->param_count+7) /8; if (my_realloc_str(net, null_count + 1)) |