Skip to content

Commit b806a54

Browse files
author
Richard Jones
committed
merge from HEAD
1 parent 643036b commit b806a54

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Fixed:
1212
discarding of the message
1313
- mailgw can override the MAIL_DEFAULT_CLASS
1414
- handle Py2.3+ datetime objects as Date specs (sf bug 971300)
15+
- use row locking in MySQL newid() (sf bug 1034211)
1516

1617

1718
2004-07-21 0.7.6

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Christophe Kalt,
9696
Brian Kelley,
9797
James Kew,
9898
Sheila King,
99+
Michael Klatt,
99100
Bastian Kleineidam,
100101
Axel Kollmorgen,
101102
Detlef Lannert,

roundup/backends/back_mysql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def newid(self, classname):
466466
''' Generate a new id for the given class
467467
'''
468468
# get the next ID
469-
sql = 'select num from ids where name=%s'%self.arg
469+
sql = 'select num from ids where name=%s FOR UPDATE'%self.arg
470470
if __debug__:
471471
print >>hyperdb.DEBUG, 'newid', (self, sql, classname)
472472
self.cursor.execute(sql, (classname, ))

0 commit comments

Comments
 (0)