From: Marc Alff Date: September 17 2010 4:57pm Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3292 to 3293) List-Archive: http://lists.mysql.com/commits/118513 Message-Id: <20100917165754.5809B45E80@linux-su11.site> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4195456089768592271==" --===============4195456089768592271== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 3293 Marc Alff 2010-09-17 [merge] Merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing modified: mysql-test/suite/perfschema/r/server_init.result mysql-test/suite/perfschema/t/server_init.test 3292 Alfranio Correia 2010-09-17 [merge] merge mysql-trunk-bugfixing --> mysql-next-mr-bugfixing modified: sql/binlog.cc sql/binlog.h sql/rpl_master.cc === modified file 'mysql-test/suite/perfschema/r/server_init.result' --- a/mysql-test/suite/perfschema/r/server_init.result 2010-08-20 08:48:59 +0000 +++ b/mysql-test/suite/perfschema/r/server_init.result 2010-09-17 16:43:02 +0000 @@ -112,18 +112,10 @@ where name like "wait/synch/mutex/sql/LO count(name) 1 select count(name) from MUTEX_INSTANCES -where name like "wait/synch/mutex/sql/LOG_INFO::lock"; -count(name) -1 -select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; count(name) 1 select count(name) from MUTEX_INSTANCES -where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state"; -count(name) -1 -select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_event_metadata"; count(name) 1 @@ -140,15 +132,15 @@ where name like "wait/synch/mutex/sql/Cv count(name) 1 select count(name) from MUTEX_INSTANCES -where name like "wait/synch/mutex/sql/LOCK_xid_cache"; +where name like "wait/synch/mutex/sql/LOCK_audit_mask"; count(name) 1 select count(name) from MUTEX_INSTANCES -where name like "wait/synch/mutex/sql/LOCK_plugin"; +where name like "wait/synch/mutex/sql/LOCK_xid_cache"; count(name) 1 select count(name) from MUTEX_INSTANCES -where name like "wait/synch/mutex/sql/LOCK_gdl"; +where name like "wait/synch/mutex/sql/LOCK_plugin"; count(name) 1 select count(name) from MUTEX_INSTANCES @@ -204,10 +196,6 @@ where name like "wait/synch/cond/sql/Que count(name) 1 select count(name) from COND_INSTANCES -where name like "wait/synch/cond/sql/Event_scheduler::COND_state"; -count(name) -1 -select count(name) from COND_INSTANCES where name like "wait/synch/cond/sql/COND_queue_state"; count(name) 1 === modified file 'mysql-test/suite/perfschema/t/server_init.test' --- a/mysql-test/suite/perfschema/t/server_init.test 2010-08-20 08:48:59 +0000 +++ b/mysql-test/suite/perfschema/t/server_init.test 2010-09-17 16:43:02 +0000 @@ -43,10 +43,6 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/mysys/THR_LOCK_myisam"; -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/mysys/THR_LOCK_myisam_log"; - select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/mysys/THR_LOCK_heap"; @@ -83,11 +79,6 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_delayed_insert"; -# Named LOCK_uuid_short in 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/LOCK_uuid_short"; - -# Named LOCK_uuid_generator in 5.5, LOCK_uuid_short in 6.0 select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_uuid_generator"; @@ -127,14 +118,16 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_server_started"; -select count(name) from MUTEX_INSTANCES - where name like "wait/synch/mutex/sql/LOG_INFO::lock"; +# LOG_INFO object are created on demand, and are not global. +# select count(name) from MUTEX_INSTANCES +# where name like "wait/synch/mutex/sql/LOG_INFO::lock"; select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/Query_cache::structure_guard_mutex"; -select count(name) from MUTEX_INSTANCES - where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state"; +# The event scheduler may be disabled +# select count(name) from MUTEX_INSTANCES +# where name like "wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state"; select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_event_metadata"; @@ -145,16 +138,11 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_user_locks"; -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/LOCK_mdl"; - select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/Cversion_lock"; -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/LOCK_audit_mask"; +select count(name) from MUTEX_INSTANCES + where name like "wait/synch/mutex/sql/LOCK_audit_mask"; select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_xid_cache"; @@ -162,28 +150,13 @@ select count(name) from MUTEX_INSTANCES select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/LOCK_plugin"; -select count(name) from MUTEX_INSTANCES - where name like "wait/synch/mutex/sql/LOCK_gdl"; +# Not a global variable, may be destroyed already. +# select count(name) from MUTEX_INSTANCES +# where name like "wait/synch/mutex/sql/LOCK_gdl"; select count(name) from MUTEX_INSTANCES where name like "wait/synch/mutex/sql/tz_LOCK"; -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/slave_start"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_active"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from MUTEX_INSTANCES -# where name like "wait/synch/mutex/sql/BML_class::THR_LOCK_BML_get"; - # Verify that these global rwlocks have been properly initilized in sql select count(name) from RWLOCK_INSTANCES @@ -224,25 +197,10 @@ select count(name) from COND_INSTANCES select count(name) from COND_INSTANCES where name like "wait/synch/cond/sql/Query_cache::COND_cache_status_changed"; -select count(name) from COND_INSTANCES - where name like "wait/synch/cond/sql/Event_scheduler::COND_state"; +# The event scheduler may be disabled +# select count(name) from COND_INSTANCES +# where name like "wait/synch/cond/sql/Event_scheduler::COND_state"; select count(name) from COND_INSTANCES where name like "wait/synch/cond/sql/COND_queue_state"; -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from COND_INSTANCES -# where name like "wait/synch/cond/sql/COND_mdl"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from COND_INSTANCES -# where name like "wait/synch/cond/sql/BML_class::COND_BML"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from COND_INSTANCES -# where name like "wait/synch/cond/sql/BML_class::COND_BML_registered"; - -# Does not exist in mysql 5.5, 6.0 only -# select count(name) from COND_INSTANCES -# where name like "wait/synch/cond/sql/BML_class::COND_BML_release"; - --===============4195456089768592271== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\ # merge/ # testament_sha1: 02ee8d2a4a263d5bdf1af0c5c41befa766a00c75 # timestamp: 2010-09-17 10:57:54 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing/ # base_revision_id: alfranio.correia@stripped\ # surf5iw0uvlrlcqi # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRMfuwAAB1ZfgEAQWGf//3+v jkC////wYAwpx8V8znIAAoBjq97q7V6Xr3Pax23Xbtbtll7YEpGqelPTJqPaoep+SZT1BkaeoDQN DTIABJIACAgCSnqHlADQAAAA5gEwEyMAIxMTCYTBDTE0wEiQTIVT3kmKn6JmRT9U/Uj1DENGTaho ABFIo0E8Qp41PJpTNBPUHlAGjQNGIBJIBTAgaamGiZTYppDJoGQYQekoSb4Zs1NxhG1l7EUJNVcO 4ziq4xEVtsYMksoQrwqHGDc8xA6y6ZvHLpxmghJwaPcP+HIaNHPhIpVtekkLEyI+koaQC1XzdGZa KmH65VVY619BMXMv2n8d4e46ikIhNCPj3+aC86IrAMYx67ZT4ONkUZLWAb3RBVnDCIZGGR2duJa9 jHAHafy1U6YYu1IM5F85yHaCTh7t8Vc84vabljSKYkS+Aah26/K26xnQghzn4OeadfHwlHdOk3+i hB0odY/OaU5MhqnBUQ+dQbxdIEudr/7gK1xa/yZmFzCTsfi4zQKSCGT856NECuZgFB0dMgNVt8Z/ Tre9rHO8zuxG3No5Zc1BQOkN8wyq3PpSnsEb9HrEXvj34CRqLYktkEUs3Xq4XPte5pW47Z8I1k+g PDiMLqkC7huUTwUFrpJBMNhepxL/OxVEawrDKWEik5wuakalrDg0MwbS7Dg78FmnyOPKXiJoNiI3 oSNAuQxdyOoW2mtiIbgiJI2Hg2+KLika79MxLVww8WkQ2zrgrwnYNu6CWEAubDBNJIuEAAfJCmCh SAKLxwXSK1HPIgvCFos0QrST/s03IZMGuxGNRaDAC0hG4LCDaytFIvmCQRqMQX1PRK4GVhka0FKZ vVAFayUYSQz+wWvZJJa5xehcANXqCFtL/zoCiYJlQONQT1kSoLA5UTWyFyl+/OnDah2hAvhN9cjr kdik9pDTdEExQJDtAWzvYcBZ/pZSdooGE8ymIg0BB6YHaEKAkb0bipFvs4Xu1vrRQhUsObc5K3QW DqV6bmrziEOC9fTDO8uMR6ZMLa+7Jzx3ENGekYyMTO6SSeC5T8tFMdwnvmhhKwa08aqQy1TrDKsq kQ1k33jCVL6KsaRgwUyp5NRqPN+9gkIKoX0BbQfq4daA9P0RFmrDfSFjQ8RHpRBVJAvj4wYr7sHN VcHbhRx/xRMMpuQvainbROgfDFjSTxkeNeh42vHqn9qlWz2QtrdYLjJJUIaptDh45+XOm0qMaHSa gE0LS9COzNKMAXodTI7g0lCGS0Y2SMSwhTJJlImw2IBGA4iMwyOg8Scs33G+RYzIdBYKXUoHRuCk PJ7SoBY0AmdjguPe9fgOBuZT+AVs3qyq72vCltAn2p3MQlzLpGq063XYXBLKb7SY3KpaB4e8GCzj Sxd66xUyGXbPPk7b0fj6nBE0Mop5wfRcyNXLcVjcajWZjRZlO1aibtayCtK9IqKSpTQ1sZUknvki 0gWsPV1ID3SU1BIZuHbxgFh1/dzEDsFdRpkE42La9A1iMBHUrM8yImpWR5JDjTx0u6o2pd+KE05C 5ZBybjhI0G7vNCHQysHJs4oxpfPXp/tbuqX2gNx1H6BagKFNQdDgr2D6piHbgjo02szsxZ7lGRfK Q/SpxqYakCywvOcMfcWJRlvcKlNWsOPSRkMxKqWMHnUoD9wfnG54GuoLUjZiK8zn81BXVs3nq1p4 sTw9JI9+fXJbQyFmeoW2MzRrhhnZ4LoOAwwRNSpZ5z2mr8/fSol5SJ0kEC5nq6rlQylXYgkEQDWQ bgeImUtYQbgmBcvK4MEwwB2AwQr1BhyFz9IHAPAMewbGeR2jGEhjGFg+4N5iEzxANiECMHw7v2Na ZqWCAgiGEiGPtE7v2N4Sk5FfzFZGpMosD+wKhRWpDFAvgKp+4E/2O8cZOsfCkZugZpIzxoShO88T wh8XaHMcoQZhEagjTTpaSMAdLaUMuMoJxk5MCdBnaDTkvaA8j3PYevpPzPgg/U+zzTDE/fYJCsPd ffrY2FxBx688gxQv0FbD2nuEI2oNbq3JAcQgJd7tjNI/H4+QTEIuobAR9iCVZVbGAabPeeJqaK+G 48eksjHcdXEq7JnHgvMwsW5mGefKp5oXYmdIrKCl8jQzeYPmBzA5UeAIXB4wImY63t5KjSajAzOW 0cYkyTbC52YeQNEtVJtvBQ/lC4lK9d+Y8hHj2SurmEhRvdbvVGXkDtkTQvkP3aGWtCtTcCsHkmuY T05zOG1nLZXoDhziaLNmGgxjwxBs6jv3QUvqCuZqtph8GBKj+YjzytAZu7mY9gON58sEKqsHFK0V oVXLoLs7xll3hRRIBw7CvJJRfDi+FT2IpTEJTpZux4kXjn2RlCMMpkhxDbv17vV7A1B51Bg3TDO3 DKFYr0j0/FN3O2+pYoR+n5KiZlaartp+FW2R20HxyS1FNhMqPDdldJgDISiwng+K8/IOQd1zrrvk HfGvqANhuP8hAD5i7mNIGPA8BiXGAUjuQq8pBIqJPhcXpPWYrPWYQkrX6BS2gQAYGtZ4rt/YeAQQ 42jgUwtCrr36w2XG57kuT/HPocUzqXt87CszcWcIRklyv2dCu/uQoB0U8nOFWTSTESwCu7+BvDaF UG8C4GidUJYGSCBdh3TCqX1sOSR9tTRATIVANRlxhklPHcp0AHEw4Ee4gqoXeM+opWiZxY1FgBrB 6PsnIJmDag94bAUBwTDPzAmbZCZCiBF7e5CsuJsKoS9/AMAkFyCvEAY9avPMArjISyFEyu26Noea wIITAVBhYrzqbVMFqPjZqm6cFwXpfMA+YvSFKprZm65AcwqgFIBhCsmHuUgHW2Z6wokiMgIwjM5V MKPoFiQKfI2i4wI8AmEjSRMylEV4YIEuC5mEg0V17T1JkCZEBBCZAMiPEPQb0HWrizMkeL+hQMAH EAkiyYSAiag4Bcjsq5Jhmuq2ZhcjCUBfRJgwHsTKE0KT7tAMjU0TUMUgmggSqo8gpc7XCzVUmIqw WDQwDBu6XnwIe8H1GMMSm05CDqE6SHRg+st6KKcJkkLDIjjLBkYFD9INe8B9Ufz97/+QhciMhKEP hMHznZ+NobXZx7sq6zr0X40Zh7AktPnBgwTuUAgxDW0qhqXSrkL0CUcTwjyMyAuIyA+sRAHf2htQ YVaGEkUYYTT5XSz6diEYgSPeOoPMEwKWleK4pcPTRl2ZnOh8XNfpFjASogyQ4UJLOQLjPomqSj2S iZxDQxWRUOtz2jW6W84nQYMZ40TaYzEMwDSA2Ggb4IgIgjXVaBSNYZYByES1NKMwPMSregKCv3mO irJmFsceDmJlxpHmaCV84BgSCIcygg9imrAiEBiIFBPIDwZ8KnbDEI4ngJi9IAqDqUp7AcA4kr3B aBMyVFDAuYGZwataTrCDp8AI4Lo9qdScs4JCkvzANOAH1SIYgpAfnTJcAwhayq8itGuhkqeU69Z8 jEE8SpAAyKXPud67HqHpriArhsRtBleRiKU0skc5OlmBK1xo7iYtwWhY601AwGaAtWz2KYhnnA+i 5MyUhNT/i7kinChICY/dgAA= --===============4195456089768592271==--