bzr push into mysql-6.0 branch (oystein.grovlen:2680 to 2681)

[Oystein Grovlen]

 2681 Oystein Grovlen	2008-09-04
      Do not propagate tree_name to main.
modified:
  .bzr-mysql/default.conf

 2680 Oystein Grovlen	2008-09-04 [merge]
      Merge from 6.0-bugteam to 6.0-backup-merge
removed:
  mysql-test/r/concurrent_innodb.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb_bug34300.result
  mysql-test/r/innodb_bug35220.result
  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data
  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data
  mysql-test/suite/rpl/t/rpl_view-slave.opt
  mysql-test/t/concurrent_innodb-master.opt
  mysql-test/t/concurrent_innodb.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb_bug34300.test
  mysql-test/t/innodb_bug35220.test
added:
  mysql-test/include/have_case_insensitive_file_system.inc
  mysql-test/include/have_lowercase2.inc
  mysql-test/include/ps_ddl_1.inc
  mysql-test/r/backup_view_on_view.result
  mysql-test/r/case_insensitive_file_system.require
  mysql-test/r/concurrent_innodb_safelog.result
  mysql-test/r/concurrent_innodb_unsafelog.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb_bug34300.result
  mysql-test/r/innodb_bug35220.result
  mysql-test/r/skip_log_bin.result
  mysql-test/std_data/corrupt_t1#P#p1.MYI
  mysql-test/std_data/corrupt_t1.MYI
  mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data
  mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data
  mysql-test/std_data/parts/t1_will_crash#P#p1_first_1024.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p2.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p2.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p3.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p4.MYI
  mysql-test/std_data/parts/t1_will_crash#P#p6.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p6_2.MYD
  mysql-test/std_data/parts/t1_will_crash#P#p6_3.MYD
  mysql-test/suite/parts/inc/partition_mgm.inc
  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
  mysql-test/suite/parts/r/partition_recover_myisam.result
  mysql-test/suite/parts/r/partition_repair_myisam.result
  mysql-test/suite/parts/t/partition_mgm_lc0_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc0_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc0_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc0_myisam.test
  mysql-test/suite/parts/t/partition_mgm_lc0_ndb.test
  mysql-test/suite/parts/t/partition_mgm_lc1_archive-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc1_innodb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc1_memory-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc1_myisam-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_myisam.test
  mysql-test/suite/parts/t/partition_mgm_lc1_ndb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc1_ndb.test
  mysql-test/suite/parts/t/partition_mgm_lc2_archive-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_archive.test
  mysql-test/suite/parts/t/partition_mgm_lc2_innodb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_innodb.test
  mysql-test/suite/parts/t/partition_mgm_lc2_memory-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_memory.test
  mysql-test/suite/parts/t/partition_mgm_lc2_myisam-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test
  mysql-test/suite/parts/t/partition_mgm_lc2_ndb-master.opt
  mysql-test/suite/parts/t/partition_mgm_lc2_ndb.test
  mysql-test/suite/parts/t/partition_recover_myisam-master.opt
  mysql-test/suite/parts/t/partition_recover_myisam.test
  mysql-test/suite/parts/t/partition_repair_myisam.test
  mysql-test/suite/parts/t/partition_special_innodb-master.opt
  mysql-test/suite/rpl/r/rpl_plugin_load.result
  mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
  mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
  mysql-test/suite/rpl/t/rpl_plugin_load.test
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
  mysql-test/t/backup_view_on_view.test
  mysql-test/t/concurrent_innodb_safelog-master.opt
  mysql-test/t/concurrent_innodb_safelog.test
  mysql-test/t/concurrent_innodb_unsafelog-master.opt
  mysql-test/t/concurrent_innodb_unsafelog.test
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb_bug34300.test
  mysql-test/t/innodb_bug35220.test
  mysql-test/t/skip_log_bin-master.opt
  mysql-test/t/skip_log_bin.test
  win/build-vs9.bat
  win/build-vs9_x64.bat
modified:
  BUILD/check-cpu
  Makefile.am
  include/my_pthread.h
  include/my_sys.h
  include/myisam.h
  libmysql/dll.c
  libmysqld/lib_sql.cc
  mysql-test/Makefile.am
  mysql-test/extra/rpl_tests/rpl_ddl.test
  mysql-test/extra/rpl_tests/rpl_log.test
  mysql-test/include/concurrent.inc
  mysql-test/include/have_lowercase0.inc
  mysql-test/lib/mtr_report.pl
  mysql-test/r/backup_ddl_blocker.result
  mysql-test/r/backup_security.result
  mysql-test/r/constraints.result
  mysql-test/r/csv.result
  mysql-test/r/federated.result
  mysql-test/r/func_regexp.result
  mysql-test/r/group_min_max.result
  mysql-test/r/handler_innodb.result
  mysql-test/r/have_utf8.require
  mysql-test/r/innodb-autoinc-optimize.result
  mysql-test/r/innodb.result
  mysql-test/r/innodb_mysql.result
  mysql-test/r/join.result
  mysql-test/r/log_tables.result
  mysql-test/r/lowercase0.require
  mysql-test/r/maria3.result
  mysql-test/r/metadata.result
  mysql-test/r/myisam.result
  mysql-test/r/partition.result
  mysql-test/r/partition_innodb.result
  mysql-test/r/partition_symlink.result
  mysql-test/r/ps_ddl.result
  mysql-test/r/show_check.result
  mysql-test/r/sp.result
  mysql-test/r/subselect.result
  mysql-test/r/subselect3.result
  mysql-test/r/subselect_no_mat.result
  mysql-test/r/subselect_no_opts.result
  mysql-test/r/subselect_no_semijoin.result
  mysql-test/r/symlink.result
  mysql-test/r/trigger-trans.result
  mysql-test/r/type_bit.result
  mysql-test/r/type_newdecimal.result
  mysql-test/suite/falcon/t/disabled.def
  mysql-test/suite/funcs_1/datadict/processlist_priv.inc
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
  mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
  mysql-test/suite/jp/t/disabled.def
  mysql-test/suite/ndb/r/ndb_partition_key.result
  mysql-test/suite/ndb/t/ndb_partition_key.test
  mysql-test/suite/parts/inc/partition_alter4.inc
  mysql-test/suite/parts/inc/partition_key_32col.inc
  mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter1_1_2_ndb.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
  mysql-test/suite/parts/r/partition_alter1_1_ndb.result
  mysql-test/suite/parts/r/partition_alter1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter1_2_ndb.result
  mysql-test/suite/parts/r/partition_alter2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_myisam.result
  mysql-test/suite/parts/r/partition_alter4_innodb.result
  mysql-test/suite/parts/r/partition_alter4_myisam.result
  mysql-test/suite/parts/r/partition_basic_innodb.result
  mysql-test/suite/parts/r/partition_basic_myisam.result
  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
  mysql-test/suite/parts/r/partition_engine_innodb.result
  mysql-test/suite/parts/r/partition_engine_myisam.result
  mysql-test/suite/parts/r/partition_special_innodb.result
  mysql-test/suite/parts/t/disabled.def
  mysql-test/suite/parts/t/partition_special_innodb.test
  mysql-test/suite/rpl/r/rpl_ddl.result
  mysql-test/suite/rpl/r/rpl_failed_optimize.result
  mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_stm_log-slave.opt
  mysql-test/t/constraints.test
  mysql-test/t/csv.test
  mysql-test/t/federated.test
  mysql-test/t/func_regexp.test
  mysql-test/t/group_min_max.test
  mysql-test/t/join.test
  mysql-test/t/log_tables.test
  mysql-test/t/lowercase_table3.test
  mysql-test/t/myisam.test
  mysql-test/t/partition.test
  mysql-test/t/partition_innodb.test
  mysql-test/t/partition_not_windows.test
  mysql-test/t/partition_symlink.test
  mysql-test/t/ps_ddl.test
  mysql-test/t/show_check.test
  mysql-test/t/sp.test
  mysql-test/t/subselect.test
  mysql-test/t/subselect3.test
  mysql-test/t/symlink.test
  mysql-test/t/type_bit.test
  mysql-test/t/type_newdecimal.test
  mysys/mf_pack.c
  mysys/my_static.c
  mysys/my_symlink.c
  mysys/safemalloc.c
  netware/BUILD/compile-linux-tools
  netware/BUILD/nwbootstrap
  netware/Makefile.am
  netware/mysql_install_db.c
  scripts/mysql_install_db.sh
  sql/backup/logger.cc
  sql/field.h
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/protocol.cc
  sql/sp_head.cc
  sql/sp_rcontext.cc
  sql/sp_rcontext.h
  sql/sql_class.cc
  sql/sql_insert.cc
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_plugin.cc
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_yacc.yy
  storage/csv/ha_tina.cc
  storage/falcon/ha_falcon.cpp
  storage/federated/ha_federated.cc
  storage/federated/ha_federated.h
  storage/innobase/ha/ha0ha.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/lock/lock0lock.c
  storage/myisam/mi_check.c
  storage/myisam/mi_create.c
  storage/myisam/mi_open.c
  storage/myisam/mi_static.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamdef.h
  strings/ctype-simple.c
  strings/ctype-sjis.c
  strings/decimal.c
  tests/mysql_client_test.c

=== modified file '.bzr-mysql/default.conf'

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-09-04 13:46:04 +0000
+++ b/.bzr-mysql/default.conf	2008-09-04 13:52:13 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-backup
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-6.0-backup-merge
+tree_name = mysql-6.0