From: Mattias Jonsson
Date: August 16 2010 7:11pm
Subject: bzr push into mysql-next-mr-bugfixing branch (mattias.jonsson:3216 to 3217)
List-Archive: http://lists.mysql.com/commits/115852
Message-Id: <201008161912.o7GJCwNa030107@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4140973845581802971=="

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

 3217 Mattias Jonsson	2010-08-16 [merge]
      merge of empty cset

 3216 Mattias Jonsson	2010-08-16 [merge]
      merge

    added:
      sql/sql_admin.cc
      sql/sql_admin.h
    renamed:
      sql/sql_alter_table.cc => sql/sql_alter.cc
      sql/sql_alter_table.h => sql/sql_alter.h
    modified:
      .bzrignore
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      mysql-test/r/not_partition.result
      mysql-test/r/partition_disabled.result
      mysql-test/r/partition_truncate.result
      mysql-test/suite/parts/inc/partition_mgm.inc
      mysql-test/suite/parts/r/partition_debug_sync_innodb.result
      mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
      mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/t/not_partition.test
      mysql-test/t/partition_truncate.test
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/datadict.cc
      sql/datadict.h
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_partition_admin.cc
      sql/sql_partition_admin.h
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_truncate.cc
      sql/sql_truncate.h
      sql/sql_yacc.yy
      sql/sql_alter.cc
      sql/sql_alter.h

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   tib2n16evtu1hc01
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\
#   bugfixing_3/
# testament_sha1: 829713c5407db6b63b4b975acc62bc42d1b2459e
# timestamp: 2010-08-16 21:11:16 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\
#   bugfixing/
# base_revision_id: mattias.jonsson@stripped\
#   4xnz5rn5tf4zlp4t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZM5kVkAAirfgAAQUGP/91IS
AAC////wUAQt5RcpcdF5aGCSTSnoaiaNqfqGh6QEymag9Ro0GSmmaTTNRoUfqg0aNAAAAlCZE00m
KGmamjQAAAARUiND1T9IanomJ6NIwhkeoyaaCSQmQCZNU9hNU9Twp4kHigM0nfiZil+i+JSmfLK0
sg9vr6zhFKNJuPKXEXfseHjkYZBRsFpKzMLaUOWWajTlKTaqO9j4P3w9GNfj87iw5lcXGunoERVV
FyvSuMV4VxvB1Ciz71JMAYJBJPZmv3XCcVqhPyCAIYzTAhyGczgxwJvol0gQZwmhjF8NMgxRGLGi
olJ1kzMkX6DgR0rCYPQb9Tu4eRJWQtLLlSbJBr+Q/RWTCiWYbah9AI7VZhPuhSI+bBsnLvNoZu0w
uyuq/gYXxHKGR7AjTEkbQt2pcp5qKYONpRruej01lYXzmKQmOzmg2QXUK8G3XyIkLmq0rR8r4cMs
nQkKDEtSZMlRoyREw83DQRlpLLk3Gx2O0KiZs0zR151KDZabjF7ljEP/TwOmBSjauU/x3lgtbs0R
Gv3uIIcuY4Z0F0VHNrsmaJmpkl9cLBOUnLyOPoF3LVN0xgUF6AUDqCAG1rGYVQCGDic5ZjC8s+hW
FRQYkiLDLgVJsMVmTrjICDQk9/SgrQXIJ5Tx5odhixUFQcyKlwrjIhLVkQUGBSgtC5C64Usj2KFS
h0OpikH+Wu1hmTeIXGs+SwijbqR6PoxaHLp7JA9+6ZFHJZ02kcy3CihFEfIyQdM2G6QN5Pt5b+Mq
Wc0rzqYgtgWcrssIM1vN/fE0a2GSDsJFpy4GLXcDDY1JGpd1IHECHdKgHWcCYxXj6zpB/Uvqcdzu
+Gjygw3QhFEd1dtcbpb7pTnMzZoHxdn1GS6Y2SA8vA4V6nwJgl9vM7HGpUcHsFQNi2q+44K0rv63
yUHnDzXBKuxjBrzCp6YLmEDTnSb2IL3WfMbBOcH0Cj3XUisjqq3oE1huPAxA5DBf5RG069jIXioe
A+pYbora81DTXArTmt50ASGSxJwILgULAxnJdhuaD5fYU1pnex0mVw52Ywdg0JFpAu49VKIbEx2C
xOQigmQ4lBMSdCLQIsDC3rG3hqAWBIGSBjSfR3SCS6HNe6QORUjw4WxliarZkJ5MRwgQgj/LF+4I
ALmQFE4lJFdJI4q19hMTQYVCEftPzJirS41ezbxSPZhp0InOyEMRRkmrgcPKeSHkqDMwVSkXzIRa
GpYKpFgtE00zguKEI7BupCWosJMYUEnGyGodqwC5uWdnd7BqNDM5aQmYHk0uZk5sWpi4jovo/4u5
IpwoSEmcyKyA


--===============4140973845581802971==--