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

ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged

configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient

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

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

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


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines

produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.


client/mysql.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
client/mysqladmin.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
dbug/dbug.c:
   _dig_vec became _dig_vec_upper.
include/m_string.h:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
  int2str() now has one more argument which controls case of digits it will produce.
include/my_global.h:
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
isam/isamchk.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
libmysql/libmysql.def:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
myisam/myisamchk.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/mf_tempfile.c:
  _dig_vec became _dig_vec_upper.
mysys/my_error.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/my_tempnam.c:
  _dig_vec became _dig_vec_upper.
sql-common/client.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/item_strfunc.cc:
  _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we
  have _dig_vec_lower instead.
sql/mysqld.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/password.c:
  _dig_vec became _dig_vec_upper.
sql/sql_bitmap.h:
  _dig_vec became _dig_vec_upper.
strings/int2str.c:
  Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair.
  int2str() now has one more argument which controls case of digits it will produce.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
strings/longlong2str-x86.s:
  _dig_vec became _dig_vec_upper.
strings/longlong2str.c:
  _dig_vec became _dig_vec_upper.
strings/my_vsnprintf.c:
  If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits
  to be snprintf() compatible.

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

configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi

Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP


innobase/btr/btr0cur.c:
  Cast away constness from dfield_get_data() result
innobase/buf/buf0buf.c:
  Enclose a debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/buf/buf0rea.c:
  Corrected compile error #ifdef UNIV_DEBUG
innobase/dict/dict0boot.c:
  Remove (char*) casts of string constants
innobase/dict/dict0crea.c:
  Remove (char*) casts of string constants
innobase/dict/dict0dict.c:
  Enclosed a debug assertion in #ifdef UNIV_SYNC_DEBUG
  Replaced some debug assertions with preprocessor tests
  Add const qualifiers to string constants
innobase/dict/dict0load.c:
  Remove (char*) casts of string constants
innobase/fil/fil0fil.c:
  Remove (char*) casts of string constants
  Enclose debug assertions in #ifdef UNIV_SYNC_DEBUG
innobase/ha/ha0ha.c:
  Enclose debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/ibuf/ibuf0ibuf.c:
  Remove (char*) casts of string constants
innobase/include/buf0buf.ic:
  Add const qualifier to string parameter
innobase/include/fil0fil.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
innobase/include/log0recv.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
innobase/include/mem0dbg.ic:
  Add const qualifiers to string parameters
innobase/include/srv0srv.h:
  Add const qualifiers to string constants
  Enclose srv_arch_dir and srv_log_archive_on #ifdef UNIV_LOG_ARCHIVE
innobase/include/sync0rw.ic:
  Add const qualifier to string parameter
innobase/include/sync0sync.ic:
  Add const qualifier to string parameter
innobase/log/log0log.c:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE
  Do not cast string constants to (char*)
innobase/log/log0recv.c:
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
  Enclose disabled log code in #ifdef UNIV_LOG_REPLICATE or UNIV_LOG_ARCHIVE
innobase/mem/mem0dbg.c:
  Add const qualifiers to string parameters
innobase/page/page0page.c:
  Remove (char*) casts of string constants
innobase/pars/pars0pars.c:
  Add const qualifier to string variable
innobase/row/row0ins.c:
  Remove (char*) casts of string constants
  Add const qualifiers to string parameters
  row_ins_foreign_check_on_constraint(): Allocate table_name dynamically
innobase/row/row0mysql.c:
  Remove (char*) casts of string constants
innobase/row/row0sel.c:
  Remove (char*) casts of string constants
innobase/srv/srv0srv.c:
  Remove (char*) casts of string constants
  Disable log archiving variables unless #ifdef UNIV_LOG_ARCHIVE
innobase/srv/srv0start.c:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Remove (char*) casts of string constants
innobase/sync/sync0rw.c:
  Remove (char*) casts of string constants
  Add const qualifier to string parameter
innobase/sync/sync0sync.c:
  Remove (char*) cast of string constant
  Add const qualifier to string parameter
innobase/trx/trx0roll.c:
  Remove (char*) cast of string constants
innobase/trx/trx0sys.c:
  Remove (char*) cast of string constants
innobase/trx/trx0trx.c:
  Remove (char*) cast of string constant
sql/ha_innodb.cc:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE

into deer.(none):/home/hf/work/mysql-4.1.spa

configure.in:
  added NDB_EXTRA_FLAGS
ndb/src/common/transporter/Makefile.am:
  removed SHM in ndb

myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
myisam/sp_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
myisam/mi_range.c:
  merging
myisam/mi_rnext.c:
  merging

into mc05.(none):/space2/tomas/mysql-4.1

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

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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged

into mc05.(none):/space2/tomas/mysql-4.1


ndb/include/ndbapi/Ndb.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/ndbapi/testGrepVerify.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged

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

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged

  automake verion problem


configure.in:
  automake verion problem

innobase/os/os0thread.c:
  Portability fix
myisam/sort.c:
  Fixed wrong variable type (gave compiler warning)

VC++Files/innobase/innobase.dsp:
  Auto merged

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


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  changed install dir


ndb/test/run-test/Makefile.am:
  changed install dir

ndb/tools/waiter.cpp:
  Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
  added install dirs for ndb
ndb/Makefile.am:
  ndb headers for install
ndb/config/common.mk.am:
  DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
  added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
  changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
  changes install dir
ndb/src/mgmapi/Makefile.am:
  changes install dir
ndb/src/mgmclient/Makefile.am:
  changes install dir
ndb/src/mgmsrv/Makefile.am:
  changes install dir
ndb/src/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/bank/Makefile.am:
  changes install dir
ndb/test/tools/Makefile.am:
  changes install dir
mysql-test/ndb/install_ndbcluster.sh:
  new
mysql-test/ndb/stop_ndbcluster.sh:
  new
ndb/tools/Makefile.am:
  changes install dir

Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged

Docs/manual_toc.html:
  Rename: BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41 -> Docs/manual_toc.html
libmysqld/lib_sql.cc:
  Fixed type of new variables
libmysqld/libmysqld.c:
  Removed duplicate function (allready in libmysql.c)