~/mysql-2a $ bzr log -l 1 jp ------------------------------------------------------------ revno: 3084 [merge] committer: Jonathan Perkin branch nick: mysql-trunk-bugfixing timestamp: Tue 2010-06-01 10:33:01 +0100 message: Merge ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions. ~/mysql-2a $ bzr ls jp/storage/innobase/ut/ --show-ids ut0auxconf_atomic_pthread_t_gcc.c ut0auxconf_atomic_pt-20090527093836-7v4wb2xxka10h4d0-388 ut0auxconf_atomic_pthread_t_solaris.c ut0auxconf_atomic_pt-20090527093836-7v4wb2xxka10h4d0-389 ut0auxconf_have_gcc_atomics.c ut0auxconf_have_gcc_-20091009120907-rmzjolcnf1dsprof-1 ut0auxconf_have_solaris_atomics.c ut0auxconf_have_sola-20090527093836-7v4wb2xxka10h4d0-390 ut0auxconf_pause.c ut0auxconf_pause.c-20090730092611-ijsopyc5sbaq7y8v-1 ut0auxconf_sizeof_pthread_t.c ut0auxconf_sizeof_pt-20090527093836-7v4wb2xxka10h4d0-391 ut0byte.c ut0byte.c-20090527093836-7v4wb2xxka10h4d0-392 ut0dbg.c ut0dbg.c-20090527093836-7v4wb2xxka10h4d0-393 ut0list.c ut0list.c-20090527093836-7v4wb2xxka10h4d0-394 ut0mem.c ut0mem.c-20090527093836-7v4wb2xxka10h4d0-395 ut0rnd.c ut0rnd.c-20090527093836-7v4wb2xxka10h4d0-396 ut0ut.c ut0ut.c-20090527093836-7v4wb2xxka10h4d0-397 ut0vec.c ut0vec.c-20090527093836-7v4wb2xxka10h4d0-398 ut0wqueue.c ut0wqueue.c-20090527093836-7v4wb2xxka10h4d0-399 ~/mysql-2a $ bzr log -l 1 mm ------------------------------------------------------------ revno: 3131 committer: Marko Mäkelä branch nick: 5.5-innodb timestamp: Tue 2010-06-01 15:09:33 +0300 message: Merge a change from mysql-5.1-innodb: ------------------------------------------------------------ revno: 3490 revision-id: marko.makela@oracle.com-20100601120751-1uq7bbta5n7ts0qr parent: marko.makela@oracle.com-20100601120521-q48hk05ne4j1s2o0 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-06-01 15:07:51 +0300 message: Minor cleanup. lock_rec_unlock(): Cache first_lock and rewrite while() loops as for(). btr_cur_optimistic_update(): Use common error handling return. row_create_prebuilt(): Add Valgrind instrumentation. ~/mysql-2a $ bzr ls mm/storage/innobase/ut/ --show-ids ut0auxconf_atomic_pthread_t_gcc.c 5096@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_atomic_pthread_t_gcc.c ut0auxconf_atomic_pthread_t_solaris.c 5096@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_atomic_pthread_t_solaris.c ut0auxconf_have_gcc_atomics.c 5998@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_have_gcc_atomics.c ut0auxconf_have_solaris_atomics.c 5096@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_have_solaris_atomics.c ut0auxconf_pause.c 5998@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_pause.c ut0auxconf_sizeof_pthread_t.c 5096@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0auxconf_sizeof_pthread_t.c ut0byte.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0byte.c ut0dbg.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0dbg.c ut0list.c 533@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fut%2Fut0list.c ut0mem.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0mem.c ut0rbt.c 2325@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Finnodb%2B%2Fut%2Fut0rbt.c ut0rnd.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0rnd.c ut0ut.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0ut.c ut0vec.c 461@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fut%2Fut0vec.c ut0wqueue.c 533@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fut%2Fut0wqueue.c