From: Jon Olav Hauglid
Date: August 24 2010 9:19am
Subject: bzr push into mysql-5.5-runtime branch (jon.hauglid:3117 to 3118)
List-Archive: http://lists.mysql.com/commits/116595
Message-Id: <201008240920.o7NMFOGr026701@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2280404118161489346=="

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

 3118 Jon Olav Hauglid	2010-08-24
      Fixed tree name.

    modified:
      .bzr-mysql/default.conf
 3117 Jon Olav Hauglid	2010-08-24 [merge]
      Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.

    added:
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/t/part_ctype_utf32.test
    modified:
      client/mysql.cc
      mysql-test/CMakeLists.txt
      mysql-test/r/ctype_utf32.result
      mysql-test/r/delayed.result
      mysql-test/r/func_str.result
      mysql-test/r/locale.result
      mysql-test/r/mysql.result
      mysql-test/r/partition_innodb.result
      mysql-test/t/ctype_utf32.test
      mysql-test/t/delayed.test
      mysql-test/t/disabled.def
      mysql-test/t/func_str.test
      mysql-test/t/mysql.test
      mysql-test/t/partition_innodb.test
      mysys/my_thr_init.c
      scripts/CMakeLists.txt
      scripts/mysqlaccess.conf*
      sql/field.cc
      sql/item_strfunc.cc
      sql/item_strfunc.h
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_insert.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_table.cc
      sql/sql_table.h
      storage/perfschema/pfs.cc
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2010-08-18 07:48:38 +0000
+++ b/.bzr-mysql/default.conf	2010-08-24 09:18:48 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.5-bugfixing"
+tree_name = "mysql-5.5-runtime"


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-test/
# testament_sha1: 1bd739dcc0e535a7af59ae3fe87b907f56ec2193
# timestamp: 2010-08-24 11:19:30 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   cmh49um003irfblt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYzoLgAAAWPfgAAQUGP/91NQ
gAC///9wQAMbcpbV1QCGSUeTEIaDTTTT1NBkA0ABlJqbJqeJGATIGjQAaABpqaU8hpGgAaaHqADQ
GgEkgjI0BTyT0m0FTyeqZoT0R6j9UZRiFdvWKL90Sz4WIjwXOVcD8htxwkmvknprspYw7+FkkHX7
Cl3pBCUsk6OdVBIYEEWjXlOEQ8AiAWGad5wYDWauzygPlARJM4Rfi6UIIya9OomEfDkh3lcqK5zm
QpkAUVCoiPsW4rReuXm+sR30NuVdE+DlJS0uycZSjGZfLZgu+Mb6GAuOlYiSH3kMCLlTriOcGrba
L/JMsmEamCgsXmB/EcxHOwynGvCbwsMNsNxR1L77cjMmthWF3FkFq9n45QsPRyjeKGEN98uqh5s0
C0RirQLRYrIaSxUprka8ruoBZDS8MpTEpsJpSWx1WhESUTiAg5LywgEpWVGqwIFa1ACocryKLj3z
NsV5Yg1pPGhYPLHBjR06XOe52sLmiibiup6atohoDnnaKRpuy32HYauOtQgi6YoR0ZGcmdYFBZFo
pcGJKnPx9Owjeio8Jb3q+HaaNF8YiL117eiH4nImcsCDDNVSVV12ClypXVxRK+so0Z0QEWlYNpIw
IV5DHfU7h1dVbRQK06CFp5dzh3afQ/2X236ZuHCGbmevzUMuO+ve12taKe8BW2Ann/WboKwyolRm
fI1I7lBw6FDFS8rO3px4EJAydeuRhcsK0/zJn77fexj2LUfRI4l6bINhFWysWZnVkXb9/+ThDq9h
+ieGf9BT+9cX3hNfZcw1+Yx+JL3PcZ1vE31DVeFxCgUcHiuQhj6pHXZNr1DsrPuIethO6rpK0Y0c
XLjXGJ7KWz5VFrIXDoTiEEN50FqSGUGTLr2FdUC8R/Ihl8/WKqPAj0CxaOWGuIs9GZPIZKvOMVzW
lWSY9xTEuVxUie9xNT2mtJvwjHEZfyqsI0Kml0tB1a32UlWHBsuXRdxXQh+DCoczqVaEK8+Uy0vV
gPUuDqmWeVgMZIqQ9i9oS9QfDzOBzBkUWgugbi9gZD+LuSKcKEhGdBcAAA==


--===============2280404118161489346==--