ndb/include/kernel/ndb_limits.h:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysys/thr_alarm.c:
  Manual merge

 - Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp


mysys/thr_alarm.c:
  Initialise sact to zero
ndb/include/kernel/ndb_limits.h:
  Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL
ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Clean up
ndb/include/ndbapi/Ndb.hpp:
  Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename.
  Made them dynamic and moved to NdbImpl.hpp
ndb/include/ndbapi/ndbapi_limits.h:
  Remove the static length's of attr, db, schema and table name.
ndb/src/common/transporter/Packer.cpp:
  Set theSignalId to ~0 when unpacking signal
ndb/src/ndbapi/Ndb.cpp:
  Moved schema, database and tablename to NdbImpl.hpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add NdbIndexImpl::init and NdbEventImpl::init
  Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl
  Delete the pseudo column NDB$RANGE_NO
  Copy tablename to internal buff in NdbDictInterface to get proper alignment.
  Convert length of table name from bytes words, when setting sz of LinearSectionPtr
  Set LinearSectionPtr array size to number of LinearSections used - save some stack.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add NdbEventImpl::init and NdbIndexImpl::init
  Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func.
  Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer.
ndb/src/ndbapi/NdbImpl.hpp:
  Use BaseString for table, schema and db names.
ndb/src/ndbapi/Ndbinit.cpp:
  Move schema and db name to NdbImpl and use BaseString
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex
sql/ha_ndbcluster.cc:
  Check if pTrans is not null before calling closeTransaction
  Remove NDB_MAX_ATTR_NAME_SIZE
  Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name

into mysql.com:/opt/local/work/mysql-5.0-root


include/my_dbug.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.
sql/mysqld.cc:
  Fix a compilation failure.

Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.


include/my_sys.h:
  Changed function name.
include/mysql_com.h:
  New function, modify_defaults_file()
libmysql/Makefile.shared:
  New file, default_modify.lo
libmysql/libmysql.def:
  New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
  New function, modify_defaults_file()
mysys/Makefile.am:
  New file, default_modify.c
mysys/default.c:
  Removed function from default.c. New, corresponding one is in default_modify.c,
  name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
  Changed function name.
sql/mysqld.cc:
  Fixed typo.

failure).


include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.

into mysql.com:/opt/local/work/mysql-5.0-root

into mysql.com:/media/sda1/mysql/mysql-5.0-libtool

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

Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling


config/ac-macros/misc.m4:
  Remove warnings flags from icc when compiling with -Werror
configure.in:
  Remove warnings flags from icc when compiling with -Werror
extra/replace.c:
  Fix warnings from icc
include/my_dbug.h:
  Fix warnings from icc
sql/gen_lex_hash.cc:
  Fix warnings from icc
sql/mysql_priv.h:
  Add missing variables
sql/mysqld.cc:
  Fix warnings from icc:
  - made a lot of variables static
  - Removing some not used variables
  - Fixed wrong printf()
  - removed extern "C" from some functions
sql/spatial.h:
  Fix warnings from icc
sql/sql_acl.cc:
  Fixed memory leak
sql/sql_lex.cc:
  Fix warnings from icc
sql/sql_lex.h:
  Fix warnings from icc

into lmy003.wdf.sap.corp:/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0

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

into mysql.com:/usr/home/ram/work/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/Makefile.am:
  fix for compilation problem with --with-openssl

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0


libmysql/libmysql.def:
  Auto merged

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/commands.cc:
  fix column name

Fix build scripts to create them.


BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
  Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
  Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
  Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
  Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
  Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
  Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
  Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
  Delete: mkinstalldirs
BUILD/FINISH.sh:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
  Added config.guess config.sub install-sh ltmain.sh missing to the ignore list

into mysql.com:/usr/home/ram/work/5.0.b10339

to easily check the storage engine supports DELAYED).



client/mysqldump.c:
  disabling --delayed-insert until BUG#7815 is fixed (need table def cae)
mysql-test/r/mysqldump.result:
  as we disable --delayed-insert, result changes

mysql-test/r/rpl_variables.result:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
mysql-test/t/rpl_variables.test:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".

into mysql.com:/usr/home/ram/work/5.0.b10339


sql/set_var.h:
  Auto merged

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286

into mysql.com:/usr/home/ram/work/5.0.b10339


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged

into mysql.com:/home/pem/work/mysql-5.0


sql/item.h:
  Auto merged
sql/sp_head.cc:
  Auto merged

  Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.


sql/item.cc:
  Make it possible to reuse allocated item slots (for use in SP execution).
sql/item.h:
  Make it possible to reuse allocated item slots (for use in SP execution).
sql/sp_head.cc:
  Reuse allocated item slots for expression evalutation during SP execution.
sql/sp_rcontext.cc:
  Updated sp_eval_func_item() call, and prevent item reuse in reused frames (for handlers).

into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286


sql/sql_yacc.yy:
  Auto merged

into mysql.com:/home/ram/work/5.0.b6267


mysql-test/r/system_mysql_db.result:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

This makes it easier to give an error in the handler if there was a problem generating an auto-increment value


mysys/thr_alarm.c:
  Remove warning from valgrind
sql/item_strfunc.cc:
  Fixed indentation
tests/mysql_client_test.c:
  Removed compiler warning

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

  Use portable check for empty string.


scripts/make_binary_distribution.sh:
  Use portable check for empty string.

into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqltest.c:
  Auto merged