into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6031

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

    added new variable for ndb port 1186
    changed meaning of ndb_port_base to be default tcp port setting
    changed to use split between port and port_base for ndbcluster
    so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
    added larger space to pid print
    moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
    added c-api to Ndb_mgmclient
    pass also ndb_port to make

  DROP DATABASE failed because of file ext not in TYPELIB of known extensions.
  General solution - construct a TYPELIB at runtime instead of a static list.

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

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

into mysql.com:/home/wax/mysql/mysql-4.1mysqltest

the result takes its charset/collation
attributes from the character string,
e.g.  SELECT func(NULL, _latin2'string')
now returns a latin2 result. This is
done by introducing a new derivation
(aka coercibility) level DERIVATION_IGNORABLE,
which is used with Item_null.
2. 'Pure' NULL is now BINARY(0), not CHAR(0).
I.e. NULL is now more typeless.

ndb: Fix return value in index_last wo/ rows

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

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

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

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

  Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form

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

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

into mysql.com:/home/my/mysql-4.1

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

into mysql.com:/home/bk/b6239-4.1-v2-pending

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

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

  fix to make make -jN work

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

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

  added so that it is possible to make mysql_test_run_new
  but not done for target all do:
   make mysql_test_run_new

  remove mysql_test_run_new for now, it breaks the make

  changed make order
.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old

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

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

into mysql.com:/home/jonas/src/new-fix

  Bug #6479  ALTER TABLE ... changing charset fails for TEXT columns
  Fix: use do_conv_blob rather than do_copy_blob
  if the column's character sets are different.

    created new facade object for CommandInterpreter
    removed CPC #if 0 code
    removed editline from mgmtsrver, no replace with readline since interface is obsolete anyways

fix null handling in ha_ndbcluster when using ordered index