From: magnus.blaudd
Date: June 21 2011 3:04pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4471)
List-Archive: http://lists.mysql.com/commits/139616
Message-Id: <20110621150426.4DB1E134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7329321163766360360=="

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

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4471 magnus.blaudd@stripped	2011-06-21
      ndb
       - fix suppression in ctype_cp932_binlog_stm.test which is
         date dependent(causes the binlog positions to change). Since it's
         midsummer today, the binlog size/position has grown with one. Enjoy!

    modified:
      mysql-test/t/ctype_cp932_binlog_stm.test
=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2010-12-09 17:12:41 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2011-06-21 15:03:03 +0000
@@ -34,7 +34,7 @@ delimiter ;|
 # the log's contents) that caused the server crash.
 
 -- disable_query_log
-call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'read error', data_len: 66125, event_type: 116");
+call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'read error', data_len: 66126, event_type: 116");
 -- enable_query_log
 
 --error 1220


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   5lc98u97seg1z4o4
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: a455ad5c6ccba4c25b218b552626bf9a5c3603c7
# timestamp: 2011-06-21 17:04:26 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   234jd54o5ve0w61e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRzr2mQAAZ/fgAAQcOf//1IE
CAS////wUAQNLXrDHW7nNXVsJRTKmyTwaKfomNTSaaYBDIyACUSaYp5NMmim0p+p6pp6ajJkMgMg
CSICaTKeqbCnqbZKB6mh6gNoQ9TGGhoAAANAAAAACSRGjSYRiNT1PVHqe1NT2qfpT01D1AGj78y8
+Lyx/U2WjKrpwaoUyNYplivUcQkZXtwVVOlS8o0raDNxizxzq3M3Qz7I84Px/XXhWnm/7rbpujN/
BhurnfQvdbLO/M3dbDHHgjN0SEz8s/OJk9ra981UdZ2EGpWJwOpPQsPKEztvnLfY4Q0RiFRXTK0v
aJQu5IlEFJhIClOWOI5RBLbSslFSU2+L3Kwpb5S5UQZG3jJBJAjje66+SYlHtu8KT83/lKJcek7h
JeKjKp2aR02xJlU2qxtZzf3itT6DsIuxGI1QMoDEU1+MyDkHBiFQxKbznwwE5hTRDyIFKkxVchrI
7d1J2U3umrmXvGyMNNNISVH1j+u23C9af8XatkbtQtSf/DlC0kV2KXUWI1NdC2wlMkaysIVVOTm8
U/yWQNL+eOT690c88gU1O97q5mFbKse3V12Y7OlEkONl6uA0TkNJl7KS7FMiT8J2wEZEhjmdoLr7
DcTQTEmKdUxpRBSp3z6Syqmu0ZcZK+zAYxgyFyLs9jSIPgs/IljFq9y9/jV4iWdkx+XcpmOwbO+0
IBoVSvRjTVpMQGJHD1gNmb/OfCieXTlqImrOrOeHYRrndsl21bEfIfCJcNzEdjZJo1v+v6nWPE/o
YCNeYZWR8yIqghy4Pq4yZ2q7CJRByIOqBnIybGZd9OnB/6lF7kjRbB8uRLxFTWHeejeIh0JitiE8
uZQUcjnldpQ9I6SeytsJtDwMy/lnxth3OkVZeFJh8S0iWXlunWvngp12E14buc09bmXqxy3jMDJ5
tr2451fhSpRP7ikQw+pNT1nPRVXXMIFB94UmCmslxNJOJ0iEj1IajPEIbJa7F5CwBWtKbu1aK0dD
Wrp8UXPHpME0DClP64KcBOOd7ZLRNHEG4SFlbjn0VF+GJ8cAnnygDwe4LhFHcWdAhiPEv1rJGCqn
fOenoIeWrwdhnGarhhJExfZLCByPzTrysqmjKHc5NpWYLSiQjPpAUZIHZdoh1xuyQNbvPZkZApkv
rt5PmC4RENi7uTFmUKGMc1gGG5mUTwRstfnTNQK43F5uu9l7zdOJfDzumiw/SZDpwSLH2MIm8CAc
p3t6RLCDcLcc4e7xE04c2EnmIdhsjyxXP5dzcDJKhqCbXQ14GGyLd7SY+5N4O0Meh8IixYOtvMvL
ojhQknPZkFR9LwxPqJlME98giIfgr09bnB6+F4evUuL6bWJVxL5a3FJHyRwKRUKXqlvQXckU4UJA
c69pkA==


--===============7329321163766360360==--