into hundin.mysql.fi:/home/marko/k/mysql-4.1

  Remove compiler warning as I had forgotten an include file


innobase/row/row0sel.c:
  Remove compiler warning as I had forgotten an include file

into hundin.mysql.fi:/home/marko/k/mysql-4.1

contains auto_increment columns.  (Bug #6633)


innobase/include/lock0lock.h:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
innobase/lock/lock0lock.c:
  Replaced lock_get_table()
  with lock_get_src_table() and lock_is_table_exclusive()
sql/ha_innodb.cc:
  ha_innobase::write_row(): Improve the ALTER TABLE optimization
  (do intermediate COMMIT also if table contains auto_increment columns)

  ndb now runs ps tests just like the others


mysql-test/t/ps_7ndb.test:
  ndb now runs ps tests just like the others
mysql-test/r/ps_7ndb.result:
  ndb now runs ps tests just like the others

  fixed erroneous previous push


sql/mysqld.cc:
  fixed erroneous previous push

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

added ndb_mgm_check_connection when error is printed


ndb/include/mgmapi/mgmapi.h:
  added check connection mgmapi method
ndb/src/mgmapi/mgmapi.cpp:
  added check connection mgmapi method
ndb/src/mgmclient/CommandInterpreter.cpp:
  added mgm_check_check_connection when error is printed
ndb/src/mgmsrv/Services.cpp:
  added check connection mgmapi method
ndb/src/mgmsrv/Services.hpp:
  added check connection mgmapi method

  fixed typo


sql/mysqld.cc:
  fixed typo

    rewrote safer
    added return value to shutdown
    nicer printouts
    removed exit at shutdown


ndb/src/common/logger/Logger.cpp:
  fixed bug/compiler warning
ndb/src/mgmapi/LocalConfig.cpp:
  removed compiler warning
  rewrote safer
ndb/src/mgmclient/CommandInterpreter.cpp:
  added return value to shutdown
  nicer printouts
  removed exit at shutdown
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  fixed compiler warning

add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged

added warning printout if --ndbcluster switch is given in a "non-cluster" binary

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101


client/mysqldump.c:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

mysql-test/r/ndb_index_unique.result:
  Test of unique index and null
mysql-test/t/ndb_index_unique.test:
  Test of unique index and null
sql/ha_ndbcluster.cc:
  Fixed long overdue problems with unique indexes and null values

client/mysqladmin.cc:
  Added option to mysqladmin for Netware.
netware/comp_err.def:
  Copyright notice update, for Netware.
netware/isamchk.def:
  Copyright notice update, for Netware.
netware/isamlog.def:
  Copyright notice update, for Netware.
netware/libmysql.def:
  Copyright notice update, for Netware.
netware/my_print_defaults.def:
  Copyright notice update, for Netware.
netware/myisam_ftdump.def:
  Copyright notice update, for Netware.
netware/myisamchk.def:
  Copyright notice update, for Netware.
netware/myisamlog.def:
  Copyright notice update, for Netware.
netware/myisampack.def:
  Copyright notice update, for Netware.
netware/mysql.def:
  Copyright notice update, for Netware.
netware/mysql_install.def:
  Copyright notice update, for Netware.
netware/mysql_install_db.def:
  Copyright notice update, for Netware.
netware/mysql_test_run.def:
  Copyright notice update, for Netware.
netware/mysql_waitpid.def:
  Copyright notice update, for Netware.
netware/mysqladmin.def:
  Copyright notice update, for Netware.
netware/mysqlbinlog.def:
  Copyright notice update, for Netware.
netware/mysqlcheck.def:
  Copyright notice update, for Netware.
netware/mysqld.def:
  Copyright notice update, for Netware.
netware/mysqld_safe.def:
  Copyright notice update, for Netware.
netware/mysqldump.def:
  Copyright notice update, for Netware.
netware/mysqlimport.def:
  Copyright notice update, for Netware.
netware/mysqlshow.def:
  Copyright notice update, for Netware.
netware/mysqltest.def:
  Copyright notice update, for Netware.
netware/pack_isam.def:
  Copyright notice update, for Netware.
netware/perror.def:
  Copyright notice update, for Netware.
netware/replace.def:
  Copyright notice update, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice update, for Netware.
netware/resolveip.def:
  Copyright notice update, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation 
  events. Do not join for the main thread if these events occur

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

    added new error type "configuration or application error"
    Added check if backup is issued during diskless mode, backup refuse returned
    added possibility to get error code as a result from management client
    addded possibility to set connecstring with CONNECT command
    changed to use strcasecmp instead of strcmp
    added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
    made thread safe veriosn of getErrorText in management server
    aligned backup errorcodes with rest of ndb error codes giving it range from 1300
    print error message from regular ndberror struct
    added new arrer type "cofiguration or application error"
    commented on allocaded ranges for errors


ndb/include/kernel/signaldata/BackupImpl.hpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
ndb/include/ndbapi/ndberror.h:
  added new error type "configuration or application error"
ndb/src/kernel/blocks/backup/Backup.cpp:
  Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/kernel/blocks/backup/Backup.hpp:
  member variable in backup block to indicate diskless or not
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Added check if backup is issued during diskless mode, backup refuse returned
ndb/src/mgmclient/CommandInterpreter.cpp:
  added possibility to get error code as a result from management client
  addded possibility to set connecstring with CONNECT command
  changed to use strcasecmp instead of strcmp
ndb/src/mgmclient/main.cpp:
  added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added possibility to get error code as a result from management client
ndb/src/mgmsrv/CommandInterpreter.cpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/CommandInterpreter.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/MgmtSrvr.cpp:
  aligned backup errorcodes with rest of ndb error codes giving it range from 1300
  print error message from regular ndberror struct
ndb/src/mgmsrv/MgmtSrvr.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.cpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/mgmsrv/Services.hpp:
  made thread safe veriosn of getErrorText in management server
ndb/src/ndbapi/ndberror.c:
  added new arrer type "cofiguration or application error"
  commented on allocaded ranges for errors
  aligned backup errors with rest of errors

into mysql.com:/space/bk/b6148-mysql-4.1


mysql-test/r/rpl_start_stop_slave.result:
  Auto merged

  Syntax change between 4.0 and 4.1.


mysql-test/r/rpl_start_stop_slave.result:
  Syntax change.

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later


mysql-test/t/ndb_grant.later:
  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later

ndb/include/ndbapi/NdbScanOperation.hpp:
  Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
  new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
  Added two more scan tests
  Collapsed testTransactions & testOperations

BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  A work-around for SCO, disable use of clock_gettime


configure.in:
  A work-around for SCO, disable use of clock_gettime

innobase/include/lock0lock.h:
  Replaced lock_get_ix_table() with lock_get_table().
innobase/lock/lock0lock.c:
  Replaced lock_get_ix_table() with lock_get_table().
innobase/include/row0mysql.h:
  row_lock_table_for_mysql(): Added parameter mode.
innobase/row/row0mysql.c:
  row_lock_table_for_mysql(): Added parameter mode.
sql/ha_innodb.cc:
  ha_innobase::write_row(): Make ALTER TABLE commits more robust:
  account for conversions from non-InnoDB format,
  do not attempt to commit if there are other than
  a single IX or IS lock on the source table, and
  the source table is in InnoDB format.  This
  prohibits intermediate commits for OPTIMIZE TABLE
  if the table contains an auto_increment field.

  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1


innobase/srv/srv0srv.c:
  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1

into mysql.com:/home/jonas/src/mysql-4.1


ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean