into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

mysql-test/lib/mtr_process.pl:
  Fix spelling errors
mysql-test/lib/mtr_report.pl:
  Fix spelling errors
mysql-test/mysql-test-run.pl:
  Remove debug code
  Fix spelling errors
  Check if slave cluster installed ok if test needs it

Remove workarounds for "hang in select"

Change to use 0.1 second sleep between kill attempt

mysql-test/r/join_outer_innodb.result:
  New BitKeeper file ``mysql-test/r/join_outer_innodb.result''
mysql-test/t/join_outer_innodb.test:
  New BitKeeper file ``mysql-test/t/join_outer_innodb.test''

mysql-test/r/func_group_innodb.result:
  New BitKeeper file ``mysql-test/r/func_group_innodb.result''
mysql-test/t/func_group_innodb.test:
  New BitKeeper file ``mysql-test/t/func_group_innodb.test''

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select
Add verbose printouts


mysql-test/lib/mtr_process.pl:
  Add verbose printouts
mysql-test/mysql-test-run.pl:
  Wait until first mysqld in slave cluster has created cluster/apply_status.ndb, put workaround in function workaround_hang_in_select

Add list of clusters and nodes


mysql-test/lib/mtr_process.pl:
  Start servers in parallell
mysql-test/lib/mtr_report.pl:
  Report about number of restarts
mysql-test/lib/mtr_stress.pl:
  Update args to pass to mysqld_start
mysql-test/mysql-test-run.pl:
  Start servers in  parallell
  Add lists for clusters and it's nodes to keep track of things

BUILD/compile-dist:
  Use --with-ssl instead of --with-yassl
config/ac-macros/ssl.m4:
  Change variable name to with_bundled_yassl

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

mysql-test/t/func_group.test:
  Test uses innodb, add test to check if innodb is available
mysql-test/t/group_min_max.test:
  Test uses innodb, add test to check if innodb is available
mysql-test/t/join_outer.test:
  Test uses innodb, add test to check if innodb is available

Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.


mysql-test/lib/mtr_cases.pl:
  Move setting of --skip-innodb out of recursive loop

mysql-test/r/partition_innodb.result:
  New BitKeeper file ``mysql-test/r/partition_innodb.result''
mysql-test/t/partition_innodb.test:
  New BitKeeper file ``mysql-test/t/partition_innodb.test''

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Auto merged

Remove extra call to vio_end


sql/mysqld.cc:
  Remove the second call to vio_end as it should only be called once when the server shutdown.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysql.cc:
  Auto merged

into  mysql.com:/data0/knielsen/tmp-5.1

mysql-test/r/sp.result:
  After-merge fixes
mysql-test/r/trigger-grant.result:
  After-merge fixes
mysql-test/t/trigger-grant.test:
  After-merge fixes
sql/sql_insert.cc:
  After-merge fixes

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  mysql.com:/usr/local/mysql/merge-5.1


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
server-tools/instance-manager/options.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/options.cc:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/join_outer.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Adjusted merge


mysql-test/r/case.result:
  Adjusted merge
mysql-test/r/type_newdecimal.result:
  Adjusted merge

Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not.


mysql-test/lib/mtr_cases.pl:
  Parse test files to find out if it needs innodb or not

into  mysql.com:/tmp/mysql-5.1-new


mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/item.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

Fixes bug#19040 "yaSSL does not compile on AIX".


extra/yassl/taocrypt/include/runtime.hpp:
  Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
  configure settings are used for yaSSL as for the other modules linked together.
  Example: the settings for "large file" on AIX.
  Fixes bug#19040 "yaSSL does not compile on AIX".

into mysql.com:/M51/merge-5.1

into  mysql.com:/usr/local/mysql/tmp-5.1


libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge.

configure.in:
  Auto merged
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
  Auto merged
BitKeeper/deleted/.del-mysql_prepare_privilege_tables_for_5.sql~76ea3c82bdbbead4:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/bdb_gis.result:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/mysqldump-max.result:
  Auto merged
mysql-test/r/ndb_bitfield.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/ndb_database.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/rpl_create_database.result:
  Auto merged
mysql-test/r/query_cache_notembedded.result:
  Auto merged
mysql-test/r/rpl_drop_db.result:
  Auto merged
mysql-test/r/rpl_multi_update3.result:
  Auto merged
mysql-test/r/rpl_slave_status.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/rpl_view.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp-vars.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger-compat.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/r/type_bit_innodb.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/binlog_row_binlog-master.opt:
  Auto merged
mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_commit_after_flush.test:
  Auto merged
mysql-test/t/rpl_insert_ignore.test:
  Auto merged
mysql-test/t/rpl_rewrt_db-slave.opt:
  Auto merged
mysql-test/t/rpl_rewrt_db.test:
  Auto merged
mysys/mf_tempdir.c:
  Auto merged
mysys/my_mmap.c:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
storage/bdb/dist/s_dir:
  Auto merged
storage/myisam/ftbench/Ecompare.pl:
  Auto merged
storage/myisam/ftbench/Ecreate.pl:
  Auto merged
storage/myisam/ftbench/Ereport.pl:
  Auto merged
storage/myisam/ftbench/README:
  Auto merged
storage/myisammrg/myrg_range.c:
  Auto merged
storage/myisammrg/myrg_rnext_same.c:
  Auto merged
strings/decimal.c:
  Auto merged
zlib/Makefile.am:
  Auto merged