From: Marc Alff
Date: June 30 2010 11:16pm
Subject: bzr push into mysql-next-mr-wl5291 branch (marc.alff:3155 to 3156)
List-Archive: http://lists.mysql.com/commits/112634
Message-Id: <20100630231611.423C545E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7572539258527640732=="

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

 3156 Marc Alff	2010-06-30
      New file in bzr ignore

    modified:
      .bzrignore
 3155 Marc Alff	2010-06-30
      Implemented code review comments: fixed FSF address

    modified:
      client/mysql_upgrade.c
      mysql-test/mysql-test-run.pl
      mysql-test/suite/perfschema/include/pfs_upgrade.inc
      mysql-test/suite/perfschema/t/pfs_upgrade_lc0.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc1.test
      mysql-test/suite/perfschema/t/pfs_upgrade_lc2.test
      scripts/Makefile.am
      scripts/comp_sql.c
      scripts/mysql_system_tables.sql
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/sql_bootstrap.cc
      sql/sql_bootstrap.h
      sql/sql_parse.cc
=== modified file '.bzrignore'
--- a/.bzrignore	2010-06-23 11:01:12 +0000
+++ b/.bzrignore	2010-06-30 23:15:47 +0000
@@ -3114,3 +3114,4 @@ libmysqld/merge_archives_mysqlserver.cma
 libmysqld/mysqlserver_depends.c
 libmysqld/examples/mysql_embedded
 sql/.empty
+libmysqld/sql_bootstrap.cc


--===============7572539258527640732==
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-wl5291/
# testament_sha1: e8bbe4beee154b640530e3f69820abc20cb117b4
# timestamp: 2010-06-30 17:16:11 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   46i8ln6omdsgj476
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUG5I2YAAXNfgEAQUGP/93ID
AAC////wUANa9nUXAO3vbeElJiTEwRhMI1J4T0KPUP1T1HpqCSUAekTZTEnogMgaAAAShNAjU1Nk
1T2UJp5AmJtCDCDJU9qhtR6h+qDTQ0HqaNAGgAEkpomm1AMnpAAAAABXjzaHLA8du+BdgzIi5NmW
eDtzbIqq8vJP48tqsy+M5+/fx9efDp2sRJY7Js+rmoGIx47YjQRW5YV8hTVxuGaaXEITUXxFPivO
IlodNHCl9yVEYzidOiGSGx0ojEQHOlFRR94wj0RmRDFz2I97YwS65K1ZSxxkwQRt04uIS8GJ6mPT
fFSDznH9xznnujymmSNlaglttsdyc2tUwxCWNFyYhVxQt8pr8cbBaEmuHqI4R1WUBIPtgaml+CcB
RJlYzhASd84HyXxtS95Vlb8YuG1gwvJ3nmcyTCuu3HBOZF8NgvpOSzJiS5gqrmyICYsNFYYGS4EJ
nFbmz0iLac6JGerBa4PmuzWuCZLlaLHhXGdZXPdfOtpSVl8AcGJWjb7aH1XROpLpGxTOUH1+BG2Q
Ly+e8tOu5hizZR0WUgpAkMjNTHjwh1Ml6mOvFkl9as8fPAQ+OSMGGkHEthmcj13aWmxoMLbeHu/t
1Eb5pmh3EcaaXUMi/twjWhi5ZPrMCg1TernjRY7LMVSkVWS38JeMnPCOfrXAwQyFIi1x5Ub2xUSi
klXOJQNXQ5hFPcP3pn4/dJuTEij6xIO0xka6recRBJIHOpZdoaM6WO3Mfmzp/IDKM9pisqqfhhVa
OiDb72RqHdtR8WkYy14hxoWDS9IpPXbkyymA6ZjM0vlD8hXLWEBvKrx4Mj8zrLA3K6uQUE89P3Xx
BHAQtK7G7ghHGYUer6m2BaEhl9hZj7NBywM7At84g94PcEZIVRDH7MIts2fQppdXERIJoLydRotd
EilnwNHdzhqyyI3rgi7l+/fdMHuaDdAcKIRVFNQdexEikpXAoVko/AhAKQHnm4sG2TRMuRENpRXb
pTA2HF1Ivd9iYS1xpSJwZEOmJIs64d8B1CnKbg+EPDY1UbFa6AtCK8eK5stSgR1bApnLXyoPBwZF
lEbGGeBkAeURyFcBAeDCInmBeJDCpiFCb82wl8xyNQUro2MZVLOKIufG6g/4u5IpwoSCDckbMA==


--===============7572539258527640732==--