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