From: Tor Didriksen
Date: October 4 2010 11:51am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3312 to 3313)
 WL#4033
List-Archive: http://lists.mysql.com/commits/119849
Message-Id: <20101004115151.40E683719@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5810526069930772190=="

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

 3313 Tor Didriksen	2010-10-04
      WL #4033 Support for informational log events
      
      Post-push fix. 
      In CTOR, initialize fields in declaration order,
      to avoid compiler warnings.

    modified:
      sql/sql_insert.cc
 3312 Alexander Nozdrin	2010-10-02 [merge]
      Auto-merge from mysql-trunk-bugfixing.

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2010-09-28 15:17:29 +0000
+++ b/sql/sql_insert.cc	2010-10-04 11:51:33 +0000
@@ -1851,8 +1851,8 @@ public:
   delayed_row(LEX_STRING const query_arg, enum_duplicates dup_arg,
               bool ignore_arg, bool log_query_arg)
     : record(0), dup(dup_arg), ignore(ignore_arg), log_query(log_query_arg),
-      forced_insert_id(0), query(query_arg), time_zone(0),
-      binlog_rows_query_log_events(FALSE)
+      binlog_rows_query_log_events(FALSE),
+      forced_insert_id(0), query(query_arg), time_zone(0)
     {}
   ~delayed_row()
   {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   svt6s12rswv02nmj
# target_branch: file:///export/home/didrik/repo/next-mr-bf/
# testament_sha1: 046d0735c1cb2faead327a5c8a8b3bcd2059ec1f
# timestamp: 2010-10-04 13:51:51 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   shoetc7e0nkpy40u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWesz7AkAAYBfgBAQWGf/938k
3IC////wUAPU97vFPGTvPbt1sJRECMTAEZGqfoo8ptT1DyR5MmTSbSDJTU9DFPSelPanoUwmgPUA
0MjIAAkiAQajVMek1PU2kGhoGjQAA0CSVNkR6ptGpgnpDaIG1BtRgTTQYTCSRGlPNTIaNT0jTanq
NqNAAAABMPeN7E3+O0LtjkiFSbjqIFlN6raXKa5gYgGIc67Nd6Ip05Hs48pocVqNdPaWzi5l5HOL
p4fvhr60ROMcUFZJHRQ2/12jFEzUSSNlgu3sjwk4sJTsIVO1WGVY40l7FwmpKPD651GwRSIstkql
kFNdyj7+gkEcbCGEQHLYOV1cROHOFT/Fa4nHomUYsBOE8jpelSKYexIzeUQRsQkeCDp0iyIwcCrF
RRg8cQLrgaZnrkVfTrAa8oljc5+Rcy4z9xgXM6auZW7++wiJmoyrAflJY1zcI1olKIv8bZJVJkt9
IQFwyalY1arSI6PelTtvUOlZCnu1Wa3UdXMysYtzkf7MrJJrd3QQNZHKX6TIeOWBiyT8TjVm5gcm
QU5364wrbnMKB1NhAsZcJzVYFi5qLkGMiUVJk+Sxhk+yMrGZgcZFzCbjkL4l7EbYNVDNWbmuxpUc
iOmm0SgTo1O001xw0H8z+P4+qIjP1hgFUXhEe7m5346/Df90xd+B+OdhHP9EsaD3mcoIB3AcDXq0
+ezeIPj0GryI3gmnDcMkc5JuqyIePnWj6wFvCgtJpdrN3Hu7o1BvS/In79E40NtutW9gg+iEddI8
8tL42TRGQppxmcpQopWNQnobqD3VuK4E6A8AOOmbftkFrYhIga13pv3CNqDdXj42yGeap4C8G6bq
JlPzKzcCP2ZbWuWvuwzXgaC1BUqnQsseQzzpisM6X7IgiSiFH8xhfmqKbzaO3L6QNG86Cqj3wYOz
s2KY2r65VsYVzISP7fyZ/sMHQyomUF1NKQlxerLj3JRTV4jJYAcp3qBfHrKFT5G00h5ac81GcGwD
AjhkyzM9GNrR5oNhfLlDiipALubUFIRcD1F0HCGUBYytrcUaOy5I3QnotY0qLmp4aUIV42Wnc8ja
w6ik5ttEGUC0FXeYQ601IqlU9wWUMyGU1F19SwKzhQq4qCM2QglyEMDKlDWNT5rguSXBJseVVRwf
wZCXDHbfqkP9Iggh2aozp4GcEnEwl54uMi/VYhOvWkUC8vFundoCnVDDMMS7TX+Aq31wzAZKgsse
VOVwOnVPX8tBmI5GnDi3YSF0Ctq+zs70F1Ck8pEtDJQ27zy5bsdLZU2kjhSUiufqUJhMSpjyWUzn
kmlPuSmuLsunDAS2VLhHjEotExuPFmgtIwazbClMQ5CNhQqFhga8XUf4u5IpwoSHWZ9gSA==


--===============5810526069930772190==--