BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqldump.c:
  Resolve merge
mysql-test/r/myisam.result:
  Resolve merge
mysql-test/r/mysqldump.result:
  Resolve merge
mysql-test/r/olap.result:
  Resolve merge
mysql-test/r/subselect.result:
  Resolve merge
mysql-test/t/myisam.test:
  Resolve merge
mysql-test/t/mysqldump.test:
  Resolve merge
mysql-test/t/olap.test:
  Resolve merge
mysql-test/t/range.test:
  Resolve merge
mysql-test/t/subselect.test:
  Resolve merge
ndb/src/common/util/version.c:
  Resolve merge
ndb/src/ndbapi/ndberror.c:
  Resolve merge
sql/item.cc:
  Resolve merge
sql/item_strfunc.h:
  Resolve merge
sql/sql_select.cc:
  Resolve merge
sql/sql_yacc.yy:
  Resolve merge

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

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.

mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Fix test to not include version number in results

failure).


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

client/mysqldump.c:
  Merge bug fix
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Merge bug fix

client/mysqldump.c:
  Optimize away a call to strend() by using return value of my_snprintf()

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

into mysql.com:/space/pekka/ndb/version/my41

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

ndb/src/common/util/version.c:
  allow upgrade 4.1.10->4.1.12

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

  Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.


sql/sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
  Added test cases for bug #7914.
mysql-test/r/olap.result:
  Added test cases for bug #7914.

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

  Added missing ';'.


sql/sql_yacc.yy:
  Added missing ';'.

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 serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/t/range.test:
  Auto merged