client/mysqladmin.cc:
  Add documentation for 'debug' command

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

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


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged

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

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


client/mysqldump.c:
  Auto merged

BUILD/compile-ia64-debug-max:
  Added archive for this build.
sql/examples/ha_archive.cc:
  Removed duplicate close call.

into zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4

  Fix tests after merge from 4.0

  Merge from 4.0


sql/sql_select.cc:
  Auto merged

+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/set_var.cc:
  Auto merged

  Fix replication for multi-update
  new test - rpl_multi_update2


sql/mysql_priv.h:
  Bug#7011
    New function mysql_multi_update_lock()
sql/sql_parse.cc:
  Bug#7011
    New function check_multi_update_lock()
    For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
  Bug#7011
    Split out multi-update locking into its own function,
      mysql_multi_update_lock()

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

mysys/my_handler.c:
  Fix for a bug in multi table updates, when offset of one table is 
  5 bytes or more. This occured because in that case binary(5) indexed
  column is space packed, so it was hit by this bug in the function
  for binary comparison.
  Bug #7788

into mysql.com:/home/dlenev/src/mysql-4.1-tzbug

into bob.(none):/home/reggie/bk/mysql41

mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers


client/mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into zim.(none):/home/brian/mysql/mysql-4.1


sql/examples/ha_archive.cc:
  Auto merged

of strings of unequal length. (Bug #8134)


mysql-test/t/compare.test:
  Add new regression test
strings/ctype-simple.c:
  Fix value used for swapping negative/positive values using XOR
mysql-test/r/compare.result:
  Add new test result

sql/examples/ha_archive.cc:
  More comments, fixed issue with lost file descriptors.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/mysqldump.result:
  Update results

was already defined on the server the dump is loaded into. (Bug #8148)


client/mysqldump.c:
  Use single quotes when setting SQL_MODE

into mysql.com:/home/dlenev/src/mysql-4.1-tzbug

into mysql.com:/export/space/pekka/ndb/version/my41

ndb/src/ndbapi/NdbRecAttr.cpp:
  fix DATE printout

  wrong order in c-file


ndb/src/common/portlib/NdbThread.c:
  wrong order in c-file

into mysql.com:/home/dlenev/src/mysql-4.1-tzbug


sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/tztime.cc:
  Auto merged

  ndbcluster requires more ports, this is the reason why builds will not start on multiple builds


Build-tools/Do-compile:
  ndbcluster requires more ports, this is the reason why builds will not start on multiple builds

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

    added shared memory config parameter, signum for use in signalling
    added global variable for holdign signum to be used for shared memory connection
    only fiddle with signals if it is set
    simplified common ndb client option handling


ndb/include/Makefile.am:
  added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
  added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
  added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
  simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
  added global variable for holdign signum to be used for shared memory connection
  only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
  use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
  use signum in new global variable for shared memory signalling
  only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
  ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
  simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
  simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
  added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
  simplified common ndb client option handling
ndb/tools/delete_all.cpp:
  simplified common ndb client option handling
ndb/tools/desc.cpp:
  simplified common ndb client option handling
ndb/tools/drop_index.cpp:
  simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
  simplified common ndb client option handling
ndb/tools/listTables.cpp:
  simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
  simplified common ndb client option handling
ndb/tools/select_all.cpp:
  simplified common ndb client option handling
ndb/tools/select_count.cpp:
  simplified common ndb client option handling
ndb/tools/waiter.cpp:
  simplified common ndb client option handling

  Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support


mysql-test/mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support
BUILD/compile-solaris-sparc-purify:
  Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options

configure.in:
  Remove unused TOOLS_LIBS: LIBS and CLIENT_LIBS should
  be enough for the global configure.in

Added the get_actual_table_name function that issues a SHOW TABLES LIKE '%s'.  This will get the table 
name in the proper case.  We use this table name rather than the one given on the command line.  This will
prevent problems when importing SQL on Linux that was generated on a Windows platform where case can be
an issue.

mysqldump.c:
  call get_actual_table_name to get the table name in the proper case


client/mysqldump.c:
  call get_actual_table_name to get the table name in the proper case

into mysql.com:/export/space/pekka/ndb/version/my41

mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types

Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".

into mysql.com:/home/mydev/mysql-4.1-4100