#At file:///Volumes/Rugged/bzr-repo/working/bug54169/ based on revid:jonas@stripped
3694 John David Duncan 2010-07-01
Fix double-checked locking that was found during a code review for
bug#54169. This may not fix the bug (which I have not yet been able to
reproduce) but is the right thing to do nonetheless.
modified:
storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp
=== modified file 'storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp'
--- a/storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp 2010-02-13 08:01:08 +0000
+++ b/storage/ndb/src/ndbjtie/mysql/CharsetMap.cpp 2010-07-01 15:16:58 +0000
@@ -59,12 +59,9 @@ void CharsetMap::unload()
*/
CharsetMap::CharsetMap()
{
- if(_map->ready == 0) // _map is an NdbLockable (it is synchronized)
- {
- _map->lock();
- if(_map->ready == 0) _map->build_map();
- _map->unlock();
- }
+ _map->lock();
+ if(_map->ready == 0) _map->build_map();
+ _map->unlock();
}
Attachment: [text/bzr-bundle] bzr/jdd@mysql.com-20100701151658-4g86dpzmuvcxi05t.bundle
Thread |
---|
• bzr commit into mysql-5.1-telco-7.1 branch (jdd:3694) Bug#54169 | John David Duncan | 1 Jul |