bzr push into mysql-5.1-bugteam branch (davi:2673 to 2674)

[Davi Arnaut]

 2674 Davi Arnaut	2008-09-01
      Restore tree name after merge from main.
modified:
  .bzr-mysql/default.conf

 2673 Vladislav Vaintroub	2008-09-01 [merge]
      merge
removed:
  mysql-test/t/rpl_view-slave.opt
modified:
  include/my_sys.h
  include/myisam.h
  myisam/mi_check.c
  myisam/mi_create.c
  myisam/mi_open.c
  myisam/mi_static.c
  myisam/myisamchk.c
  myisam/myisamdef.h
  myisam/rt_index.c
  mysql-test/r/group_min_max.result
  mysql-test/r/myisam.result
  mysql-test/r/rpl_log.result
  mysql-test/r/symlink.result
  mysql-test/r/type_bit.result
  mysql-test/r/udf.result
  mysql-test/t/disabled.def
  mysql-test/t/group_min_max.test
  mysql-test/t/myisam.test
  mysql-test/t/rpl_ddl.test
  mysql-test/t/rpl_log-slave.opt
  mysql-test/t/rpl_log.test
  mysql-test/t/symlink.test
  mysql-test/t/type_bit.test
  mysys/my_symlink.c
  mysys/thr_lock.c
  sql/field.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/opt_range.h
  sql/set_var.cc
  sql/sql_parse.cc
  sql/sql_select.cc
  sql/sql_udf.cc
  sql/unireg.h

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-08-15 17:55:05 +0000
+++ b/.bzr-mysql/default.conf	2008-09-01 20:11:42 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.0"
+tree_name = "mysql-5.1-bugteam"