Use a 32-bit right-shift implementation through a 64-bit integer that should work ok for both gcc and Visual C++; the code depended on defining SIZEOF_LONG, and that is not set when compiling ibbackup


innobase/ut/ut0ut.c:
  Use a 32-bit right-shift implementation through a 64-bit integer that should work ok for both gcc and Visual C++; the code depended on defining SIZEOF_LONG, and that is not set when compiling ibbackup

  Fix Windows porting bugs that broke ibbackup: 1) wrong error check in for CreateDirectory(), 2) wrong error check if the file did not exist in DeleteFile(), 3) too strict sharing restrictions in os_file_create_simple(): when ibbackup called that function, it would not allow mysqld to write to the file


innobase/os/os0file.c:
  Fix Windows porting bugs that broke ibbackup: 1) wrong error check in for CreateDirectory(), 2) wrong error check if the file did not exist in DeleteFile(), 3) too strict sharing restrictions in os_file_create_simple(): when ibbackup called that function, it would not allow mysqld to write to the file

into hundin.mysql.fi:/home/heikki/mysql-4.1

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

  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

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

  We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown
os0file.c:
  Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows


innobase/os/os0file.c:
  Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows
innobase/fil/fil0fil.c:
  We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged

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

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

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

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

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

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

Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.



mysql-test/t/archive.test:
  Test Bug: Memory leaks in the archive handler.
  Fixed a typo.
sql/examples/ha_archive.h:
  Test Bug: Memory leaks in the archive handler.
  Added declarations for the new init/cleanup functions.
sql/handler.cc:
  Test Bug: Memory leaks in the archive handler.
  Added calls of the new init/cleanup functions.

BUILD/SETUP.sh:
  Abort if wrong options
BUILD/compile-pentium64-debug:
  Always use full debugging
innobase/fil/fil0fil.c:
  Fixed wrong printf() format

into mysql.com:/my/mysql-4.1

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


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

into mysql.com:/my/mysql-4.1

This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files

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

Bug#8101  unique indexes which attribute are _not_ specified in the order of the table does not work

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

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

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


sql/sql_select.cc:
  Auto merged

    remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix

  Added test case for bug #7672 that existed only in 4.0.


mysql-test/t/order_by.test:
  Added test case for bug #7672 that existed only in 4.0.
mysql-test/r/order_by.result:
  Added test case for bug #7672 that existed only in 4.0.

  Add more diagnostics about why page reads in recovery may hang: print the number of pending pread calls


innobase/buf/buf0rea.c:
  Add more diagnostics about why page reads in recovery may hang: print the number of pending pread calls

into hundin.mysql.fi:/home/heikki/mysql-4.1


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