into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

win/cmakefiles/im:
  New BitKeeper file ``win/cmakefiles/im''

into  zim.tangent.org:/home/brian/mysql/cleanup-5.1

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

  Fixed bug in test case


mysql-test/r/rpl_stm_log.result:
  Fixed bug in test case

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_heap.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

  Fixed bug in test case


mysql-test/t/rpl_stm_log.test:
  Fixed bug in test case

mysql-test/t/rpl_row_sp005.test:
  Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp005.result:
  Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_sp009.test:
  Updated by adding ORDER by to use test with NDB engine
mysql-test/r/rpl_row_sp009.result:
  Updated by adding ORDER by to use test with NDB engine
mysql-test/t/rpl_row_view01.test:
  Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_row_view01.result:
  Updated by adding ORDER BY and sleep to use test with NDB engine
mysql-test/r/rpl_relay_space_myisam.result:
  updated

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


configure.in:
  Auto merged
include/heap.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_update.cc:
  Manual merge
tests/mysql_client_test.c:
  SCCS merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  linux.site:/home/reggie/work/mysql-5.1

into  big_geek.:C:/Work/mysql/mysql-5.1

win/cmakefiles/base:
  add flag for diabling insecure crt functions warning
win/cmakefiles/client:
  add dependency to GenError to make sure the error files are made
win/cmakefiles/extra:
  add custom target to run comp_err
win/cmakefiles/sql:
  removed comp_err stuff.

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

mysql-test/t/rpl_temporary.test:
  Removed MyISAM per lars
mysql-test/r/rpl_temporary.result:
  Removed MyISAM per lars

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/rpl_row_log.result:
  Auto merged
mysql-test/r/rpl_skip_error.result:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_skip_error.test:
  Auto merged
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a:
  Auto merged
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734:
  Auto merged
mysql-test/t/rpl_load_from_master.test:
  Auto merged

mysql-test/extra/rpl_tests/rpl_row_blob.test:
  Changes that Larss requested
mysql-test/r/rpl_row_blob_innodb.result:
  Changes that Larss requested
mysql-test/r/rpl_row_blob_myisam.result:
  Changes that Larss requested
mysql-test/r/rpl_insert_id.result:
  updated results
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk.test:
  Suggested PK test by Lars
mysql-test/t/rpl_insert_id_pk-slave.opt:
  Suggested PK test by Lars
mysql-test/r/rpl_insert_id_pk.result:
  Suggested PK test by Lars
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  updated per lars

mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/r/rpl_insert_id.result:
  Updated wiht 1022 error, order by and PK for use with NDB engine
mysql-test/t/rpl_skip_error.test:
  updated to wrk with ndb
mysql-test/r/rpl_skip_error.result:
  updated to wrk with ndb
mysql-test/t/rpl_sporadic_master.test:
  updated to wrk with ndb
mysql-test/r/rpl_sporadic_master.result:
  updated to wrk with ndb
mysql-test/t/rpl_row_trig002.test:
  updated to work with NDB engine
mysql-test/r/rpl_row_trig002.result:
  updated to work with NDB engine
mysql-test/t/rpl_temporary.test:
  updated to work with NDB engine
mysql-test/r/rpl_temporary.result:
  updated to work with NDB engine
mysql-test/extra/rpl_tests/rpl_row_001.test:
  updated to work with NDB as default engine
mysql-test/r/rpl_row_001.result:
  updated to work with NDB as default engine
mysql-test/t/rpl_row_blob_innodb.test:
  Fixed bug in test case
mysql-test/t/rpl_row_blob_innodb-slave.opt:
  Added slave option file to ensure correct engine type on slave
mysql-test/r/rpl_row_blob_innodb.result:
  Updated results
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  update results file

Apply a patch by Jonas for NDB diskdata.


mysql-test/r/sp-code.result:
  Fix a test result after merge: 94 and 95 are SQLCOM codes of 
  SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
  renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Apply second patch by Jonas to make NDB diskdata work on systems
  without O_DIRECT support.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/innodb.result:
  Manual merge: null merge, use local.
mysql-test/t/innodb.test:
  Manual merge: null merge, use local.
sql/ha_innodb.cc:
  Manual merge: null merge, use local.
sql/ha_innodb.h:
  Manual merge: null merge, use local.
storage/innobase/btr/btr0sea.c:
  Manual merge: null merge, use local.
storage/innobase/dict/dict0dict.c:
  Manual merge: null merge, use local.
storage/innobase/dict/dict0load.c:
  Manual merge: null merge, use local.
storage/innobase/fil/fil0fil.c:
  Manual merge: null merge, use local.
storage/innobase/include/univ.i:
  Manual merge: null merge, use local.
storage/innobase/os/os0sync.c:
  Manual merge: null merge, use local.
storage/innobase/srv/srv0start.c:
  Manual merge: null merge, use local.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

This bug was only on Windows but we updated the call to 
create_temporary_file to match what is being done in other
areas of MySQL


sql/sql_partition.cc:
  the O_RDWR mode and MY_WME were used in this code before the switch
  was made to create_temp_file.  The parameters are still there
  so we just plug in the mode and WME so the underlying code will 
  create the temp file with the right mode.  This only affected 
  Windows.  [This comment was from the first changset that I was unable
  to bk fix].  This changeset adds O_BINARY | O_TRUNC | O_TEMPORARY

into  linux.site:/home/reggie/work/mysql-5.1

storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Apply the diskdata patch by Jonas: the patch adds a fallback to 
  the standard I/O if O_DIRECT does not work.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

The problem is that LEX_STRING was used instead of LEX_STRING::str.


sql/sql_trigger.cc:
  Fix typo: we should have used LEX_STRING::str instead of LEX_STRING.

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

mysql-test/r/binlog_row_blackhole.result:
  Update test results to reflect use of std_data_ln
mysql-test/r/rpl_row_flsh_tbls.result:
  Update test results, drop tables to clean up
mysql-test/r/rpl_row_log.result:
  Update test results to reflect use of std_data_ln

The handlerton structures for archive and CSV had not been updated. Nicht so gute. I also fixed CSV to use fast alter table and put in a test in archive in case someone tries to do the same there (hint... it won't work). 


mysql-test/r/archive.result:
  New results
mysql-test/r/csv.result:
  New results
mysql-test/t/archive.test:
  Adding test for new fast alter table
mysql-test/t/csv.test:
  Adding test for new fast alter table
sql/ha_archive.cc:
  Updating handlerton to remove warnings.
storage/csv/ha_tina.cc:
  Updating handlerton to remove warnings, and updated CSV to handle fast alter table.
storage/csv/ha_tina.h:
  New method.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


storage/innobase/btr/btr0sea.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/btr0sea.ic:
  Manual merge: use local.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/field.cc:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/innodb.result:
  SCCS merged
mysql-test/t/innodb.test:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged

into  linux.site:/home/reggie/work/mysql-5.1