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


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

into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/order_by.result:
  SCCS merged
mysql-test/t/order_by.test:
  SCCS merged
sql/sql_yacc.yy:
  SCCS merged

  removed usage of SIGRTMIN temorarilly as it causes problems on some platforms


ndb/include/ndbapi/ndb_opt_defaults.h:
  removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

    clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last

table_list->schema_table_name may be 0 in this case and 'strcasecmp' is 
not necessary in this case.

into hundin.mysql.fi:/home/marko/j/mysql-5.0

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

  added docs


ndb/include/ndbapi/NdbScanFilter.hpp:
  added docs

innobase/include/rem0rec.ic:
  Improve formatting of comments
innobase/include/trx0trx.h:
  dict_operation: document the effect of setting the flag
innobase/row/row0mysql.c:
  Do not set the dict_operation flag. (Bug #8144)
  Allow MySQL to have open handles to the table being truncated.
sql/ha_innodb.cc:
  store_lock(): Do not weaken TL_WRITE locks taken by TRUNCATE TABLE.

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


ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

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

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

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

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

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

  wrong order in c-file


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

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


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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


Build-tools/Do-compile:
  Auto merged
configure.in:
  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

ndb/include/Makefile.am:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/tools/delete_all.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/drop_tab.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  SCCS merged
ndb/src/mgmsrv/main.cpp:
  resolved merge conflict

    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

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

ndb/include/ndb_constants.h:
  post-merge fix

mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbRecAttr.cpp:
  merge

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

  Add includes for the _stat() call to compile on Windows in Hot Backup build


innobase/os/os0file.c:
  Add includes for the _stat() call to compile on Windows in Hot Backup build

  Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space


innobase/ut/ut0mem.c:
  Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last

into mysql.com:/space/my/mysql-5.0

into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

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