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

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


mysql-test/t/disabled.def:
  Auto merged

  updated


mysql-test/t/disabled.def:
  updated

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

  uninit variable


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Correct signal length

  Added comments on 1022 per Lars request


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Added comments on 1022 per Lars request

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

added option for verbose ndb startup


mysql-test/mysql-test-run.pl:
  added option for relative pat in ndb config
mysql-test/ndb/ndbcluster.sh:
  added option for relative pat in ndb config

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo

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

  end_ptr to my_strtoll10 is in/out parameter


sql/sql_yacc.yy:
  init end_ptr as it's an in/out parameter, not only out

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

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

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

libmysqld/lib_sql.cc:
  logger initialization added
mysql-test/mysql-test-run.pl:
  ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
  ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
  result fixed
mysql-test/r/sp_notembedded.result:
  result fixed
mysql-test/t/log_tables.test:
  test disabled in embedded server
mysql-test/t/sp_notembedded.test:
  test fixed

storage/csv/ha_tina.cc:
  Removed unimplemented methods.
storage/csv/ha_tina.h:
  Reomoved unneeded methods

  had to add order by


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
  had to add order by

BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
  Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
  Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
  Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
  Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
  setting back to orginal values

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

into  selena.:H:/MYSQL/src/#00000-mysql-5.1


client/mysqlslap.c:
  Auto merged
configure.in:
  Auto merged
VC++Files/mysql.sln:
  manual merge

into  mysql.com:/usr/local/mysql/tmp5.1

into  mysql.com:/usr/local/mysql/tmp5.1

calculate ndbcluster slave port


mysql-test/mysql-test-run.pl:
  calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
  option to run mysql-test-run without binlog
sql/mysqld.cc:
  option to run mysql-test-run without binlog

into  mysql.com:/usr/local/mysql/tmp5.1

into  mysql.com:/usr/local/mysql/tmp5.1


sql/sql_class.cc:
  Auto merged

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix sol10-amd64-a compile failure, conflict with system headers.
sql/log.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/mysql_priv.h:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_delete.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/table.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_parse.cc:
  Fix HPUX compile failure, initializing char * with const char *

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

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

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


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

into  mysql.com:/home/stewart/Documents/MySQL/5.1/2868

BACKUP previous set up triggers using DICT.
This lead to all kind of trouble.
An smaller alternative to using SUMA for backup
  is to just make BACKUP handle triggers to TUP directly.

This way all triggers will be totally local,
  and error handling is much simpler.

--- old impl.

Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
Master sends ALTER_TRIG_REQ (online) to local DICT
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends DROP_TRIGGER to local DICT
Master sends STOP_BACKUP_REQ to all participants

--- new impl.

Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends START_BACKUP_REQ to all paricipants
  Participand sends CREATE_TRIG_REQ for all tables to local TUP
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends STOP_BACKUP_REQ to all participants
  Participant sends DROP_TRIGGER to local TUP

Changes:
All trigger handling is _local_
 This implies, that abort (e.g due to node failure) can be _local_


fix testBackup test so that it will run successfully with the (now correct)
backup trigger code.


storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  rework START_BACKUP signals as we no longer need tableId and triggerIds.
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  START_BACKUP_REQ no longer has tableIds and trigger ids
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Use TUP triggers directly.
  
  removes ALTER trigger
  simplifies DROP triggers
  
  changes to node failure handling
  
  changes in signal order
  
  use SlaveData to track slave status.
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  - remove ALTER_TRIG (now unused)
  - add signalNo to BackupRecord
  - add SlaveData
  - remove dead items from MasterData
  - update prototype of startBackupReply
storage/ndb/src/kernel/blocks/backup/Backup.txt:
  Update signals for new backup code.
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove ALTER_TRIG REF and CONF as we no longer use them.
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add comment about meaning of triggerId
  Add sender BlockNumber parameter to dropTrigger.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  for SUBSCRIPTION triggers, make it so that the trigger ids are private to each block.
storage/ndb/test/ndbapi/testBackup.cpp:
  Don't do initial restart, just a restart. This is to avoid cache issues with
  schema versions
storage/ndb/test/src/NdbBackup.cpp:
  Update error insertions.