diff options
| author | ramil@mysql.com <> | 2006-04-11 23:46:27 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2006-04-11 23:46:27 +0500 |
| commit | 62b85c13888c7555ba14761cf4a6c5b3bf80b32b (patch) | |
| tree | 54ed2f55fc09b6de43580d55c2512236737cea4e /sql | |
| parent | 094c4290cab5de4903c26c6a32e36a009de33a17 (diff) | |
| parent | cb011af0b0d3369703d63710fe5fadd66dce148f (diff) | |
| download | mariadb-git-62b85c13888c7555ba14761cf4a6c5b3bf80b32b.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b14360
Diffstat (limited to 'sql')
| -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 67aab57b880..320b8e1df9d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -321,7 +321,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, if (!table_list->derived && !table_list->view) table_list->updatable= 1; // usual table } - else + else if (thd->net.last_errno != ER_WRONG_OBJECT) { /* Too many delayed insert threads; Use a normal insert */ table_list->lock_type= lock_type= TL_WRITE; |