diff options
| author | unknown <anozdrin/alik@station.> | 2007-10-09 14:32:43 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@station.> | 2007-10-09 14:32:43 +0400 |
| commit | 2e53f3631164bf88471f63cafc884072d4167686 (patch) | |
| tree | 48d5e25662c23157e4c32bcb77d378e57b6b3ccc | |
| parent | 4b7f527270951a6c490556ccc6a1d735cc746f37 (diff) | |
| parent | db50f37ae044487e88cf0275b97424ca748f92d1 (diff) | |
| download | mariadb-git-2e53f3631164bf88471f63cafc884072d4167686.tar.gz | |
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Manual merge/
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 6a7e3e00f6f..9b1578280e4 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -965,7 +965,6 @@ void init_update_queries(void); void free_max_user_conn(void); pthread_handler_t handle_bootstrap(void *arg); bool mysql_execute_command(THD *thd); -bool do_command(THD *thd); bool dispatch_command(enum enum_server_command command, THD *thd, char* packet, uint packet_length); void log_slow_statement(THD *thd); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 10c59d6a374..91eaadb0d9f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -86,6 +86,7 @@ const char *xa_state_names[]={ "NON-EXISTING", "ACTIVE", "IDLE", "PREPARED" }; +static bool do_command(THD *thd); static void unlock_locked_tables(THD *thd) { @@ -681,12 +682,12 @@ bool do_command(THD *thd) DBUG_PRINT("info",("Got error %d reading command from socket %s", net->error, vio_description(net->vio))); + /* Check if we can continue without closing the connection */ + if (net->error != 3) - { - statistic_increment(aborted_threads,&LOCK_status); DBUG_RETURN(TRUE); // We have to close it. - } + net_send_error(thd, net->last_errno, NullS); net->error= 0; DBUG_RETURN(FALSE); |