diff options
| author | davi@buzz.(none) <> | 2008-03-17 16:13:59 -0300 |
|---|---|---|
| committer | davi@buzz.(none) <> | 2008-03-17 16:13:59 -0300 |
| commit | df5cf2b1ded1a29fe31bb9e4f8a65408591edf06 (patch) | |
| tree | 278a06c5d7b0c6da3ee8bc65f506bf6a0480b385 /sql-common | |
| parent | 393c54db5076dd93453a992e67fa136fc88cf359 (diff) | |
| parent | 44fe22e727c41759474a8724129e1d80e9bbd3bb (diff) | |
| download | mariadb-git-df5cf2b1ded1a29fe31bb9e4f8a65408591edf06.tar.gz | |
Merge buzz.(none):/home/davi/mysql-5.0-runtime
into buzz.(none):/home/davi/mysql-5.1-runtime
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index e7cf30c1a35..e9e057ae8b2 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -732,11 +732,12 @@ my_bool cli_advanced_command(MYSQL *mysql, enum enum_server_command command, const uchar *header, ulong header_length, const uchar *arg, ulong arg_length, my_bool skip_check, - MYSQL_STMT *stmt __attribute__((unused))) + MYSQL_STMT *stmt) { NET *net= &mysql->net; my_bool result= 1; init_sigpipe_variables + my_bool stmt_skip= stmt ? stmt->state != MYSQL_STMT_INIT_DONE : FALSE; DBUG_ENTER("cli_advanced_command"); /* Don't give sigpipe errors if the client doesn't want them */ @@ -744,7 +745,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command, if (mysql->net.vio == 0) { /* Do reconnect if possible */ - if (mysql_reconnect(mysql)) + if (mysql_reconnect(mysql) || stmt_skip) DBUG_RETURN(1); } if (mysql->status != MYSQL_STATUS_READY || @@ -776,7 +777,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command, goto end; } end_server(mysql); - if (mysql_reconnect(mysql)) + if (mysql_reconnect(mysql) || stmt_skip) goto end; if (net_write_command(net,(uchar) command, header, header_length, arg, arg_length)) @@ -2523,6 +2524,9 @@ my_bool mysql_reconnect(MYSQL *mysql) if (stmt->state != MYSQL_STMT_INIT_DONE) { stmt->mysql= 0; + stmt->last_errno= CR_SERVER_LOST; + strmov(stmt->last_error, ER(CR_SERVER_LOST)); + strmov(stmt->sqlstate, unknown_sqlstate); } else { |