diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-18 23:13:48 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-18 23:13:48 +0200 |
| commit | 5dae19b394e3385c0e48d896fec1174437f2308a (patch) | |
| tree | 287897ebd815b64a05c0ca7076beccd5245a2f8d /sql/sql_insert.cc | |
| parent | 469fce643c6f71c3bcaaa62454604fbb30bcbacc (diff) | |
| download | mariadb-git-5dae19b394e3385c0e48d896fec1174437f2308a.tar.gz | |
Fixed some reported bugs
BUILD/compile-alpha-cxx:
Building on Alpha with Compaq C and C+++
Docs/manual.texi:
Changelogs and update of links
myisam/mi_key.c:
Fixed multi_part keys where first part where of TEXT/BLOB type
mysys/Makefile.am:
Makefile.am now works with Compaq make
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/test-select.sh:
Made the count_distinct_big test a bit smaller
sql/log.cc:
Changed the slow log format to have more information by default
sql/mysqld.cc:
false->FALSE
sql/share/german/errmsg.sys:
Update of messages
sql/share/german/errmsg.txt:
Update of messages
sql/sql_base.cc:
Fixed SELECT DISTINCT *
sql/sql_insert.cc:
Cleanup
sql/sql_table.cc:
Added logging of DROP of temporary tables
vio/VioFd.cc:
false -> FALSE
vio/VioSSL.cc:
false -> FALSE
vio/VioSSLFactoriesFd.cc:
false -> FALSE
vio/VioSocket.cc:
false -> FALSE
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ec727591e2a..25ca7d76e03 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -118,11 +118,10 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, if we are told to replace duplicates, the insert cannot be concurrent delayed insert changed to regular in slave thread */ - if (lock_type == TL_WRITE_DELAYED && - ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) || - thd->slave_thread - ) || - lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE) + if ((lock_type == TL_WRITE_DELAYED && + ((specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) || + thd->slave_thread)) || + (lock_type == TL_WRITE_CONCURRENT_INSERT && duplic == DUP_REPLACE)) lock_type=TL_WRITE; if (lock_type == TL_WRITE_DELAYED) |