database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Browse Source 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
This commit is contained in:
tomas@poseidon.ndb.mysql.com
2005-07-15 15:08:38 +02:00
parent f18ae81380 f54afc792f
commit 911d878ca9
85 changed files with 1727 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_insert.cc
View File

@ -1743,7 +1743,7 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
#endif
if (thd->killed || di->status)
break;
if (error == ETIME || error == ETIMEDOUT)
if (error == ETIMEDOUT)
{
thd->killed= THD::KILL_CONNECTION;
break;