mariadb/innobase
unknown 56ea770272 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).
Backported from 5.0.3.


innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate records we take X-lock
  for duplicate records.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
  take X-lock in this case for duplicate records.
2005-04-18 12:17:32 +03:00
..
btr row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h: 2005-04-06 10:27:40 +03:00
buf buf0flu.c: 2005-03-15 08:33:47 +02:00
data InnoDB: Fixed bugs in the padding and trimming of trailing spaces 2004-12-17 18:35:11 +02:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE 2005-04-12 16:12:34 +03:00
dyn Remove unnecessary files 2004-02-19 11:32:07 +02:00
eval InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
fil fil0fil.c: 2005-04-14 22:27:15 +03:00
fsp Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
fut Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ha Merge with 4.0.21 2004-06-18 04:38:58 +03:00
ibuf ibuf0ibuf.c: 2004-11-04 00:10:00 +02:00
include InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE 2005-04-12 16:12:34 +03:00
lock Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 2004-11-30 17:52:30 +02:00
log log0recv.c: 2005-03-09 20:32:01 +02:00
mach merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
mem InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
mtr Merge with 4.0.21 2004-06-18 04:38:58 +03:00
os InnoDB: Avoid test suite failures caused by a locking conflict 2005-04-06 15:09:15 +03:00
page InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
pars merge with 4.0 2004-11-02 08:58:45 +02:00
que Merge with 4.0.21 2004-06-18 04:38:58 +03:00
read merge with 4.0 2004-03-16 22:41:30 +02:00
rem InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
row Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 2005-04-18 12:17:32 +03:00
srv InnoDB: Avoid test suite failures caused by a locking conflict 2005-04-06 15:09:15 +03:00
sync Merge 2004-10-08 15:43:27 +03:00
thr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
trx trx0trx.c: 2005-03-21 22:21:55 +02:00
usr Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
ut InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
configure.in configure.in: 2004-12-01 18:02:34 +02:00
Makefile.am Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
makefilewin Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
my_cnf Added Innobase to source distribution 2001-02-17 14:19:19 +02:00