From: Anitha Gopi
Date: June 13 2011 4:19am
Subject: bzr push into mysql-trunk branch (anitha.gopi:3192 to 3193) Bug#11933491
List-Archive: http://lists.mysql.com/commits/139125
X-Bug: 11933491
Message-Id: <201106130419.p5D4Jdgi014881@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1880903898=="

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

 3193 Anitha Gopi	2011-06-13
      Move rpl.rpl_change_master_debug to experimental group. This fails on redhat due to Bug#11933491

    modified:
      mysql-test/collections/default.experimental
 3192 Karen Langford	2011-06-10 [merge]
      Committed merge

    modified:
      libmysqld/emb_qcache.cc
      libmysqld/lib_sql.cc
      sql/event_scheduler.cc
      sql/field.cc
      sql/ha_ndbcluster_binlog.cc
      sql/log_event.cc
      sql/protocol.cc
      sql/rpl_slave.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/sql_admin.cc
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_error.cc
      sql/sql_insert.cc
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_signal.cc
      sql/sql_table.cc
      sql/sql_time.cc
      sql/sql_update.cc
      sql/sys_vars.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-06-06 10:29:45 +0000
+++ b/mysql-test/collections/default.experimental	2011-06-13 04:17:23 +0000
@@ -19,6 +19,7 @@ rpl.rpl_heartbeat_basic                 
 rpl.rpl_row_sp011  @solaris              # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_seconds_behind_master            # BUG#11765124 2010-11-24 luis fails sporadically on pb2
 rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sporadically on pb2
+rpl.rpl_change_master_dbug               # BUG#11933491 2011-06-13 Anitha  Test fails on redhat 
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.wait_timeout_func                    # Bug#11750645 2010-04-26 alik wait_timeout_func fails


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk/
# testament_sha1: c54c885ebc9eee4ceaf662c08a5b4ddff48286fa
# timestamp: 2011-06-13 09:49:34 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: karen.langford@stripped\
#   0l4od4ntf1v55e5o
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVsYeRUAAYrfgAAYWGP/93KC
BgC////wUAOaTUTegmbdBJJAEZEe1MmJPRqaeU0ZRkPKG0GUQ9T0RiaEyj0mhppoAAGhhJE0IJtQ
1T8pqZP1TT0QaDQaNBkMNDQAAAaAAAAAElJknkJsiJsU2ibSZDQAADhyhvvbwNdJGdr8AImO8pSp
GHiy+fvjf3dDMx4fVXxTezhhryK6t+mm3RC3Xp8/X7+HxnZzxiVhq3krP3ccxzC4Sc37psFkdsdw
n6zsIgJH29bZI59jq0iReSW+dSni+FeUCzbsWjJEg06VJS2fx4CjtGPiwdLCwnM0WKmoYk1rl5Ca
xbJ07vfBX2fSwTUCNDjga2SN4p3JD1Rdl92oSBu0LhzW3g9kDvxC4tLYiQaKU5bgesXqX8w6proY
RquElgsBbiKqFrIv6uUp5zB5QW4ipwLAiNJ7qxhsFAfbU4Oe24SFolAuQqTbEcmtP0KIqLWCuhwq
iyY4PsOhonNWXFmDfB4wfZeUDRrgBIRgcLCs3YAGeNTZZnVYEphGZqGA/hLIHIKktAWZyDHFVv47
fJ7tzcKklUfW1MKY0oJ8i5lBqSbMqV3PrTSWuJfvwV+MYvdbJTyo9HByk5JnaCoUq2PeYas/Ac2j
D59sIltS0cZjSwxB1aD/OiYttOJr8JUunSAYCixxpOlhr2kxh/cq0iGzHIlOFJIMLZnWGhYmwazr
QLH3XijeTszGpXbX+u2uMpv27wmkPPJd7r+5scyRb7pFNA1GGfNTaFEmct62UGnBqSuuCk1F5Tzo
clljyrcCoi1j3XdC1X1Xkhzzxs2Nm7XGKY44w8sDljqe2cq8/inY03ZxoRUG5OXAqt02VrKNHCfu
04Y+qlUM7lXiQWNVuJipQryKTnfHddYoDI9FDqRGQsnvSkwHoMAmLCF8VhKGlnByVZHHkmZs5ctA
8HFuQRf936Haxago4ZBag3T8OMBaypP1Bj4ag285iG9RCLSGGLlzySGJ36dvZMZTkkWNlWgcWNKR
BoNOFZMtqQEmdHX5DpZROou9MpMmTHPYaFzmLf3KV6FSRBmzRnbJL6SKAoVLK6BaZd/eEWdVuvaz
JxvPoKkFRnYMbB+ApYZNaihJeLFWOAfk0dm3MAaZ0Qyrr2hVVh02jOmSQPTFQGIc+FZmFIYXPsO4
Tm3DAnmpmLB86rQPlfUboFAQUhMtfMqXFx7ba0+umw600qWkHDnC9BOCLFmOgoTKZE/H/F3JFOFC
QWxh5FQ=


--===============1880903898==--