Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later


mysql-test/t/ndb_grant.later:
  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later

BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged

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

  A work-around for SCO, disable use of clock_gettime


configure.in:
  A work-around for SCO, disable use of clock_gettime

  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1


innobase/srv/srv0srv.c:
  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1

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

    added command CONNECT in management client
    added some verbose printouts
    removed prompt printout on !isatty(0)


ndb/src/mgmapi/mgmapi.cpp:
  improved verbose printouts on connecting to management server
ndb/src/mgmclient/CommandInterpreter.cpp:
  cleaned up code a bit
  added command CONNECT in management client
  added some verbose printouts
ndb/src/mgmclient/main.cpp:
  removed prompt printout on !isatty(0)
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added verbose opotion

(Cleanups and better bug fixes)


mysql-test/r/select.result:
  Fixed test after wrong merge
mysql-test/t/select.test:
  Fixed test after wrong merge
scripts/mysql_fix_privilege_tables.sh:
  Don't read defaults files
sql/item_cmpfunc.cc:
  Fix wrong value for not_null_tables_cache
sql/item_cmpfunc.h:
  Remove wrong patch (flags are set in fix_length_and_dec())
sql/item_func.h:
  Fix wrong value for not_null_tables_cache
sql/slave.cc:
  Fixed indentation

  Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error


sql/ha_innodb.cc:
  Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error

  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup


innobase/buf/buf0buf.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/buf/buf0lru.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/buf0lru.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/db0err.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/row0sel.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/ut0mem.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/mem/mem0pool.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0mysql.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0sel.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/srv/srv0start.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/ut/ut0mem.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup

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

only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given


ndb/src/mgmsrv/main.cpp:
  moved default setting to config.ini to MgmtSrvr

into mysql.com:/space/bkroot/mysql-4.1

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

  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1


sql/table.cc:
  Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1

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

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


sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

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

    changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy


ndb/src/common/logger/LogHandler.cpp:
  changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp:
  some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  rewrote parsing on parseNameValuePair, was buggy

into mysql.com:/home/timka/mysql/src/4.0-master


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok:
  auto-union
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/repl_failsafe.cc:
  Merging 4.0 and 4.1 changes.

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

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Scan number allocation must be on table even in case of range scan
  Otherwise scan takeover won't work as LQHKEYREQ contains table

BitKeeper/etc/logging_ok:
  auto-union
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/select.result:
  Merge for BUG#3759
mysql-test/t/select.test:
  Merge for BUG#3759

into mysql.com:/space/bk/b6148-mysql-4.0


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

slave SQL thread is started.


sql/slave.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/slave.h:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/sql_repl.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.
sql/repl_failsafe.cc:
  Adding threads to init as parameter to init_master_info.
  Only rewind read position when starting SQL thread.

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

mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos

  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system


innobase/configure.in:
  Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system

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

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

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

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