bzr push into mysql-5.5-runtime branch (jon.hauglid:3117 to 3118)

[Jon Olav Hauglid]

 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"


Attachment: [text/bzr-bundle] bzr/[e-mail]