into  linux.site:/home/marty/MySQL/mysql-5.1-new

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

win/build-vs71.bat:
  fixed call out to deploy.bat
win/build-vs8.bat:
  fixed call out to deploy.bat
win/cmakefiles/base:
  changed win32 to win
win/cmakefiles/sql:
  use proper win folder for path
win/configure.js:
  this file should be called from the root so we need to use the path

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892

into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

post-push fix for bug#16407 (sql_mode discarded)
WL#1034 (Internal CRON)

scripts/mysql_fix_privilege_tables.sql:
  fix to be event and ADD

into lmy004.:/work/mysql-5.1-bug16407

add sql_mode to mysql.event
WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
mysql-test/r/system_mysql_db.result:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_create_system_tables.sh:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_fix_privilege_tables.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event

into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

win/build-vs71.bat:
  batch file to build project files for Visual Studio 2003
win/build-vs8.bat:
  batch file to build project files for Visual Studio 2005
win/cmakefiles/base:
  cmakefile that will later be moved into the target directory
win/cmakefiles/bdb:
  cmakefile that will later be moved into the target directory
win/cmakefiles/client:
  cmakefile that will later be moved into the target directory
win/cmakefiles/dbug:
  cmakefile that will later be moved into the target directory
win/cmakefiles/deploy.bat:
  cmakefile that will later be moved into the target directory
win/cmakefiles/extra:
  cmakefile that will later be moved into the target directory
win/cmakefiles/heap:
  cmakefile that will later be moved into the target directory
win/cmakefiles/innobase:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisam:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisammrg:
  cmakefile that will later be moved into the target directory
win/cmakefiles/mysys:
  cmakefile that will later be moved into the target directory
win/cmakefiles/regex:
  cmakefile that will later be moved into the target directory
win/cmakefiles/sql:
  cmakefile that will later be moved into the target directory
win/cmakefiles/strings:
  cmakefile that will later be moved into the target directory
win/cmakefiles/taocrypt:
  cmakefile that will later be moved into the target directory
win/cmakefiles/vio:
  cmakefile that will later be moved into the target directory
win/cmakefiles/yassl:
  cmakefile that will later be moved into the target directory
win/cmakefiles/zlib:
  cmakefile that will later be moved into the target directory
win/config-handlerton.js:
  javascript file for updating handlerton.cc based on configure options
win/config-version.js:
  javascript file for updating mysql_version.h based on configure.in data
win/configure.js:
  basic configure javascript

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  last bug fix revealed another bug.
  fix buffer management when parsing table descriptor


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  remove pages on backup record, use buffer in file record instead
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  remove useless pages on backup record
    file buffer is good enough
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove useless pages on backup record
    file buffer is good enough

into  mysql.com:/usr/local/mysql/x/mysql-5.1-new

into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new


BitKeeper/etc/ignore:
  Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
  merged
mysql-test/r/mysqltest.result:
  merged
mysql-test/t/mysqltest.test:
  merged

+ fix crashing bug when discovering ndb tables outside select context

into  mysql.com:/usr/local/mysql/x/mysql-5.1-new


scripts/make_win_src_distribution.sh:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  Allow GET_TABINFO during BACKUP
  (otherwise LCP gets corrupt)


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  All GET_TABINFO during BACKUP

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

into  mysql.com:/home/jimw/my/mysql-5.1-clean

into  mysql.com:/usr/local/mysql/x/mysql-5.1-new


VC++Files/sql/mysqld.vcproj:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
VC++Files/client/mysqldump.vcproj:
  Manual merge.

into  mysql.com:/usr/local/mysql/x/mysql-5.1-new

into lmy004.:/work/mysql-5.1-events_i_s