into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

into neptunus.(none):/home/magnus/mysql/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

(for octane2)

included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c


cmd-line-utils/libedit/term.c:
  fixed Bug #5589 "libedit compile failure in term.c"
  
  (for octane2)
  
  included term.h if there isn't termcap.h

into neptunus.(none):/home/magnus/mysql/mysql-4.1

ndb/src/mgmsrv/main.cpp:
  Print error if read of local config file fails.

on intelxeon3 (Solaris x86))


mysql-test/r/ps_2myisam.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_3innodb.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_4heap.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_5merge.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_6bdb.result:
  Test results fixed (order by for a couple of statements in the PS test).

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

into mysql.com:/usr/home/bar/mysql-4.1

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

  removed help text for non implemented command


ndb/src/mgmclient/CommandInterpreter.cpp:
  removed help text for non implemented command

into poseidon.(none):/home/tomas/mysql-4.1-ndb

  SQL_SELECT_LIMIT=0 protection


client/mysql.cc:
  SQL_SELECT_LIMIT=0 protection

Restoring displaying database and user which was removed in a mistake
in the previous change.

acinclude.m4:
  Fix warnings reported by aclocal > 1.8
configure.in:
  Fix warnings reported by aclocal > 1.8

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

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

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

added fix for keeping "records" up to date when execute() fails


mysql-test/r/ndb_insert.result:
  Added testcase for select count() during transaction with failures
mysql-test/t/ndb_insert.test:
  Added testcase for select count() during transaction with failures
sql/ha_ndbcluster.cc:
  added fix for keeping "records" up to date when execute() fails
sql/ha_ndbcluster.h:
  added fix for keeping "records" up to date when execute() fails

sql/sql_repl.cc:
  code clean-up: we can use thd here.

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  new method to set size of local table data
ndb/src/mgmsrv/ConfigInfo.cpp:
  clearer configure description texts
ndb/src/ndbapi/DictCache.cpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/DictCache.hpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/NdbDictionary.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  new method to set size of local table data
sql/ha_ndbcluster.cc:
  new method to set size of local table data
  moved allocation/deletion of Ndb objects to Thd_ndb
sql/ha_ndbcluster.h:
  move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects

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

Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").


mysql-test/r/sql_mode.result:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added the test results.
mysql-test/t/sql_mode.test:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added new tests for the bug.
sql/sql_lex.cc:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added code to recover from skipped spaces in mode IGNORE_SPACES,
  when testing for an ident separator (which happens to be a dot).

into mysql.com:/M41/mysql-4.1

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged

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