diff options
| author | aivanov@mysql.com <> | 2006-04-11 22:46:26 +0400 |
|---|---|---|
| committer | aivanov@mysql.com <> | 2006-04-11 22:46:26 +0400 |
| commit | cb011af0b0d3369703d63710fe5fadd66dce148f (patch) | |
| tree | d0301860e2986862d0c67ebdf2f40f78795341c1 /sql/sql_insert.cc | |
| parent | fff2bc4d469b82761b101b4698ae3c738d92675b (diff) | |
| parent | 5ae25ea5f750937b89d2fc52756eb0776d0d666e (diff) | |
| download | mariadb-git-cb011af0b0d3369703d63710fe5fadd66dce148f.tar.gz | |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alexi/bugs/mysql-5.0-merge
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 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; |