diff options
| author | monty@mysql.com <> | 2005-11-05 01:32:55 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-11-05 01:32:55 +0200 |
| commit | a6f5375cb0cb40055f52e92d20ca04233ce70386 (patch) | |
| tree | 4a7b533b6da471261f5c13c46e4e9f256ec63a0c /sql/sql_insert.cc | |
| parent | 3b74bb1b03a32616818f50f59cc44644036ab711 (diff) | |
| parent | 303f6b4a7a44511aeb33ccbd9ff43ea2d454aa4c (diff) | |
| download | mariadb-git-a6f5375cb0cb40055f52e92d20ca04233ce70386.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index beca9842e6d..8877cc17bf0 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1822,7 +1822,7 @@ pthread_handler_t handle_delayed_insert(void *arg) #endif if (thd->killed || di->status) break; - if (error == ETIMEDOUT) + if (error == ETIMEDOUT || error == ETIME) { thd->killed= THD::KILL_CONNECTION; break; |