Merge commit 'abh/master'; commit 'gbarr/truncate-binlog'
commit8734457a1edd39ecec1188dcaedbb17f4e5d1be4
authorKeith Rarick <kr@xph.us>
Tue, 17 Nov 2009 23:20:52 +0000 (17 15:20 -0800)
committerKeith Rarick <kr@xph.us>
Tue, 17 Nov 2009 23:20:52 +0000 (17 15:20 -0800)
tree24019a31d270c41281a94fef3e941b1d5b096c2e
parent5fa2e8ae49798f1370d82e3431e2df6adda461c5
parentee671fad03701def60af908da2b76b28f4808f0a
parentd11faa0605e451a3a15420b28e5af59f9335ea96
Merge commit 'abh/master'; commit 'gbarr/truncate-binlog'