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


ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

(old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

This fixes problem with auto increment on different byte order

(This also make adding of signed ints really simple...)


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/Ndb.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])
ndb/src/ndbapi/NdbOperationInt.cpp:
  Use native format in interpreter
  (old code mixed the 3 alternatives: native, [lo, hi], [hi, lo])

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

ndb/include/ndb_global.h:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/Process.cpp:
  Include my_alarm (to get signal.h)
ndb/src/cw/cpcd/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/kernel/vm/Emulator.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmclient/main.cpp:
  Include my_alarm (to get signal.h)
ndb/src/mgmsrv/Services.cpp:
  Include ndb_global instead of string.h
ndb/src/ndbapi/NdbOperationInt.cpp:
  Keep consistent order of 64 bits in interpreter
ndb/src/ndbapi/TransporterFacade.cpp:
  Include my_alarm (to get signal.h)

into avenger.(none):/export/brian/mysql/4.1

sql/examples/ha_tina.cc:
  Adding in pieces to remove from compile (aka ifdef).

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-hpux

hpux11 compiler dislikes empty array initializers.

Limit testBackup BackupOne

ndb/test/ndbapi/testBackup.cpp:
  Drop table after testBackup
ndb/test/src/NdbBackup.cpp:
  Remove node id

ndb/src/ndbapi/TransporterFacade.cpp:
  Retry alloc of node id

mysql-test/r/ps_1general.result:
  Updated test results for addition of CSV engine.

into mysql.com:/home/mysql_src/mysql-4.1-874

var->save_result.ulong_value was 0 on Mac OS X probably due to positions
of members in the union. sys_var::check() only sets ulonglong_value


sql/set_var.cc:
  Of the save_result union, sys_var::check() only updates ulonglong_value;
  so other types of the union are garbage. Here we must use ulonglong_value
  in sys_var_sync_binlog_period::update(), not ulong_value (which is )

  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.


mysql-test/t/ctype_utf8.test:
  Bug#4521: unique prefix keys, fix for HEAP HASH and HEAP BTREE case insensitive collations.

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

sql-bench/server-cfg.sh:
  Remove the limitation for NDB+blobs

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

2) Fix variable scope for irix compiler


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Remove part of require
ndb/test/src/NDBT_Tables.cpp:
  old compiler fix

ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init page state
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Init usr pointer for tcseize/releasereq
ndb/test/src/NDBT_Tables.cpp:
  More error printouts

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

Adding test cases for the example storage engine (so that you can test to see if it was built correctly).

into avenger.(none):/export/brian/tina-4.1


acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

sql/set_var.cc:
  Changed have_example to have_example_engine (easier to understand when reading output). Also resolved merge problem.

myisam/mi_key.c:
  SCCS merged

only MyISAM is fixed


include/m_ctype.h:
  my_charpos() macro
myisam/mi_key.c:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/r/binary.result:
  new test
mysql-test/r/key.result:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/t/binary.test:
  new test
mysql-test/t/func_gconcat.test:
  make test to pass w/o InnoDB
mysql-test/t/key.test:
  apply UNIQUE constrain correctly for multi-byte charsets

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


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged

timeout in abort handling with more than 128 operations

ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes for LQH
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Automatic nulling of tvariables

ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.

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