BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/util/Makefile.am:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
ndb/test/tools/Makefile.am:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union
server-tools/instance-manager/Makefile.am:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union

ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged

ndb/include/kernel/AttributeDescriptor.hpp:
  removed unused
ndb/include/kernel/ndb_limits.h:
  removed unused
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Differentiate between nullable columns and null fields
    TUP wants sum all other want #null cols
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle distribution key and collation in same subroutine
ndb/src/kernel/vm/VMSignal.hpp:
  Increase size of signal->theData to 32k
ndb/test/ndbapi/testPartitioning.cpp:
  better usage

into arthur.local:/my/mysql-5.0-clean

sql/share/errmsg.txt:
  Removed incorrect error messages; Fixed serbian messages.

mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().

into hundin.mysql.fi:/home/jan/new/mysql-5.0

  My attempt N3


sql/share/errmsg.txt:
  My attempt N3

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

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

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

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

            


sql/sp.cc:
  A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi
  We test current_select (in case of error) in the my_message_sql().

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

tests/client_test.c:
  Moved variable declaration to the beginning of the block.
  (It's a C file, not C++)

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

Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.

ndb/test/ndbapi/testPartitioning.cpp:
  Update test partitioning to add primary keys (distribution keys)
    incase of either 
  - only 1 primary key
  - primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
  Fix so that Hugo can cope with pk's in the "end" of the table

include/my_global.h:
  Define UINT_MAX8
libmysql/libmysql.c:
  Replace defines for insteger limits with their custom MySQL versions.

sql/ha_innodb.cc:
  Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new
  value for auto increment field is set if the new values is creater than
  the maximum value in the column.

fixes. Still to do: 
-  deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.


include/my_time.h:
  More calls are shared between client and server (libmysql now performs
  more intelligent date->number and number->date conversions).
  TODO: rename those which are not starting with 'my_'
include/mysql.h:
  MYSQL_BIND:
  - more elaborated comment
  - some of the ex-private members were given public names - 
    it's sometimes convenient to set bind->error to &bind->error_value.
    However Monty questions the idea, so it should be given
    more thought in future.
  - added new members to support data truncation.
  Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
libmysql/libmysql.c:
  - added support for data truncation during fetch
  - implementation for is_binary_compatible: now conversion functions
    are used less frequently
  - we now use number_to_datetime and TIME_to_ulonglong for date->number and
    number->date conversions
sql-common/my_time.c:
  - added implementation of date->number and number->date calls shared 
    between client and server (moved from time.cc).
sql/field.cc:
  - implemented Field_time::store_time() to better support date->time
    conversions in prepared mode. After-review fixes.
sql/field.h:
  - Field::store_time now returns int
sql/mysql_priv.h:
  - removed date->number and number->date conversion functions headers
    (moved to my_time.h)
sql/time.cc:
  - removed implementation of date->number and number->date conversion
    functions (moved to my_time.c)
tests/client_test.c:
  - added a test case for data truncation; other test cases adjusted.
  - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
    are now printed out prettier).

into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0

server-tools/instance-manager/thread_registry.h:
  Fix for the problem, encountered by Ramil

ndb/test/include/HugoOperations.hpp:
  Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
  Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
  Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
  Fix pkRead on ordered index

ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fix typo

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix setting of dist keys for ordered indexes
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Remove support for combined distribution key and range scan
sql/ha_ndbcluster.cc:
  Merge error with wl2126

into hundin.mysql.fi:/home/jan/new/mysql-5.0

sql/ha_ndbcluster.cc:
  #ifdef on key_multi_range
sql/ha_ndbcluster.h:
  Use forward declarations for key_multi_range

ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Set distribution key for ordered indexes
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Allow create_index_object to modify index_table
ndb/tools/restore/consumer_restore.cpp:
  Allow create_index_object to modify index_table

into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-14

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

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout of SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set correct status on scanfrag record
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix setting of distribution key wrt scan
ndb/tools/select_count.cpp:
  Fix select_count

     +more code reuse
     +easier testing of indexes


ndb/include/ndbapi/NdbDictionary.hpp:
  Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
  Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
  Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
  Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
  Pass index on constructor
ndb/test/src/HugoOperations.cpp:
  Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
  Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
  Use HugoOpertaions to run transactions

extra/comp_err.c:
  Fixed compile error with -debug for some compilers.