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


sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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

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

  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

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

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

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

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

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

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

  CAST now always return a well-formed character string.


sql/item_timefunc.cc:
  CAST now always return a well-formed character string.

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

ndb/test/run-test/Makefile.am:
  Make sure to instal 16 -node tests

ndb/Makefile.am:
  added ndbapi-examples directory to src distibution

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


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

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/jonas/src/mysql-5.0

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

  failed to find the newly introduced extra/mysqld_ername.h header file)


VC++Files/client/mysqltest.dsp:
  - added "../extra" to the include path (Windows compile failed to find the
    newly introduced extra/mysqld_ername.h header file)

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


sql/set_var.cc:
  Auto merged

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

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0

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


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/univ.i:
  Auto merged

Added a call to close the meta file after a repair.

into mysql.com:/my/mysql-5.0

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


sql/set_var.cc:
  Auto merged

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

sql/ha_federated.cc:
  changes to get rid of compile warnings
sql/ha_federated.h:
  changes to get rid of compile warnings

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0