From: Andrei Elkin
Date: December 23 2010 11:28am
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3261) WL#5569
List-Archive: http://lists.mysql.com/commits/127554
Message-Id: <201012231128.oBNBSpsT010400@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0455203955=="

--===============0455203955==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3261 Andrei Elkin	2010-12-23 [merge]
      wl#5569 MTS merging from the repo.

    added:
      mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt
    modified:
      mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result
      mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
      mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel-slave.opt
      mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
      mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_sequential.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      sql/rpl_rli.cc
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-23 10:35:28 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 11:27:15 +0000
@@ -2848,7 +2848,7 @@ int apply_event_and_update_pos(Log_event
     int error= 0;
     if (skip_event || 
         (!rli->is_parallel_exec() ||
-         (!rli->curr_group_is_parallel || rli->curr_event_is_not_in_group)))
+         (!rli->curr_group_is_parallel)))
     {
       DBUG_ASSERT(skip_event || !rli->is_parallel_exec() ||
                   (!rli->curr_group_is_parallel ||
@@ -4349,7 +4349,7 @@ int slave_start_workers(Relay_log_info *
   rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level;
   rli->mts_total_groups= 0;
   rli->curr_group_seen_begin= FALSE; // initial presumtion, will change
-  rli->curr_group_is_parallel= TRUE; // initial presumtion, will change
+  rli->curr_group_is_parallel= FALSE; // initial presumtion, will change
   rli->curr_group_isolated= FALSE;
   rli->run_query_in_parallel= opt_mts_slave_run_query_in_parallel;
   rli->checkpoint_seqno= 0;


--===============0455203955==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 6624a82cfa3e5331033a2913cf81495b2eb1a796
# timestamp: 2010-12-23 13:28:51 +0200
# base_revision_id: alfranio.correia@stripped\
#   4qogccd97mqn0g3p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU0gJqAAA1HfgEIQeGf//3MG
HAC////wYAacXwAAGmgAAABpBNI9RkBo9Tym1ABkAADQDmATACYAATAAEwADmATACYAATAAEwABp
oVT2VNP1J6jTR+lPTUaAGgxMT1GnkgOYBMAJgABMAATAAEkQQmAJiCYQ1NU9T2hIaepkep6nlPR8
dNkt5U+LxprJ8opVMcxAqNeEviAoIG+URmdo2NY446HYNHEjDg6Zj2EgSSQLdQS5ngpThpUOSDJV
IVQ7AxER3QGivVrXXGdNtC0QZQ1v6HwYLr/PDDLMKhhUhIjqmiQA1aIkgeUTzvvZBKGhAly44JSC
EnIhYHx9s+s7nntuRkAoEwuXZEzY3sTMjwLeHA7o8jmeghvv151StEBsjESO/BZXTd3x56V+R9Hq
QMy+Nw/wRQKJghgFISXNx0VcnFU+sqGgUQCmFUKhVioNyPFFVTBSSP+ZBcLkwXgzMWpHqUoS/ZkQ
FmGWxAAcgRAVgBMeSt0LI4i/ct3nMsKDUU8er1+/BHX+yOW8K8Du2jGeJftRBGQXihzzLgFU+R8i
eQGACpTiRyKIiNQ2JkBOYBvHVTkiR31dLmWfhGRzuNiiuA1d5Nib5owSKwoGAIxOtwmEVB0txsCh
G6LxRksdxOV9w9N5cYWi5jCP+o4HuHNFlAtCgHORkHHpKZfiUU6jGBiIcPrQFWe/8GYUEUwpV8Xo
dxmurcHENzLyw/c7FDAcyMgs0qhYjwDiINeb9irih+lRiEPRy6MarrMEb7Zpqi4MStFVSOm6J2qY
sC1D1i9DnKJ5kMNxbSWrj8USJb7/GQ4ti6/Tmj1DeEEMbtmHLMQfmLgStJ0lBTAHWdjEpkrykpzv
3W95PZQQRrvoJU0cSJN3INaTRtfywRIN4qq4XQLgxLWLzUgSEqSjdfEvWQ1AViJkIDNfKkYagzio
BMHFFygZweNSVFIxVP+NTzDDkYFh7Zs0Bg9fiN6nyGmGwMIP56FVrDDASafduJPopePu4RyiEhjC
jv9QqJpRnAqSQ63AHVPk7HTsWiPLpzRVI+B7TP6h+t+Eiws1EKVAS0UUn8Ij55A8jgcDaBIPQ2Gd
DDjP9zjIJl3rmLECkrUjCKOBaQ4gJljWCEzCaGsBjh7kvMUmkMB1EHC7iNiDIsad4RuusZi0t6Qq
kW/JKqnEMSNAtPd+BnuwcYQqBCxIuDS/2bdGxM9fMzJ2qpGxVQKZE4emIPSLColGR8y7hnqI6Btw
C4BXHcR9KQ3zot76Hnt5Q+oDAlf33f4FsOecSQzr9tCZmeDI7LFme1WJc8rs+NHLt6QleUZuY/nQ
4gLoMGPDGwv83O1foQVNWIkQ3QBkmS37+OxDj01I9yKHp29RwNCIpHmaI6YGmw0DtX2hQHp6QDng
dcgzPY8eg1oz9bjBGqmEzqDuQ0ZWBwR5CIh0CWYiWZvFu/J+kQOoeDq/aDAN9Y4t8L0T2F3JGicS
HTC1B8eom3nzMkmJGwaAa3xDX2GYSJu6V9VWx/TGj+epqVGAW6AWGoFUvgcxG8oLd6JI5L+BORAV
aXuh5mxz/0hgKQgbgJkRfhjwogP9DT2V4hMiksDqoP9ikSIcCJUa0nYNPCQqxUE7VuDU2RSUjlBM
KT0DuWxNwTvqRsDERIYtHkMB/kcSIlRFKDjA8jufRFpuSJMkwp0CvSgGz4lG4zuCGoJUoLB4L8iF
3S3YdnRMLZCj+py+NS1wPJLgiALLzOI4yUw5K9rDeVrhLhXSbtxiXIiHyCk4hVuaRlAgJisOQrS9
AEj5mwYRKegCoCNAhrcTqQDJFJp+olYpH1Od1FZgvsfbM3BaMk1R3G4qBllQwcC0xqAcqWjJnJIa
0tGKYnsPYqmHSa1ntM773Pc+aJECAUk4wMB8UeB3b+4xO3kWh0rSsAaLikaCMO6MTZEaaziO6xEP
iHUbrSe6DIBrbxN5hNDgYCK9DecT7okTA0LK3BhZhqRsFUIpU0Un/xdyRThQkE0gJqA=


--===============0455203955==--