BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list

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

sql/ha_ndbcluster.cc:
  SCCS merged

  corrected typo in previous changeset


sql/ha_ndbcluster.cc:
  corrected typo in previous changeset

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Minor tweaks to work properly


Build-tools/Do-solaris-pkg:
  Minor tweaks to work properly

sql/ha_ndbcluster.cc:
  merge

Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
+added some comments to ndb fragmentation calulation

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1

  Deposit the new .pkg.gz into the ~/$hostname/ directory


Build-tools/Do-solaris-pkg:
  Deposit the new .pkg.gz into the ~/$hostname/ directory

  Perl script to create Solaris installation packages.

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged

mysql-test/r/subselect.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/r/subselect_innodb.result:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'
mysql-test/t/subselect_innodb.test:
  test depends on innodb moved from 'subselect' to 'subselect_innodb'

mysql-test/r/drop_temp_table.result:
  result update

BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
scripts/Makefile.am:
  Auto merged
mysql-test/r/drop_temp_table.result:
  SCCS merged
sql/sql_base.cc:
  SCCS merged

mysql-test/r/type_date.result:
  Update results

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


sql/item_func.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup


sql/mysql_priv.h:
  Auto merged
sql/table.h:
  Auto merged

Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments).


sql/mysql_priv.h:
  Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
sql/opt_range.cc:
  Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
sql/sql_base.cc:
  Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
sql/sql_select.cc:
  Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only.
sql/table.h:
  Outer joins cleanup: 
   * Remove TABLE::outer_join and use TABLE::maybe_null only.
   * Added comments.

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

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

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

Cleanup during reviews of new pushed code


BUILD/compile-pentium-debug-max:
  Use --debug=full as default
BUILD/compile-pentium-debug:
  Use --debug=full as default
mysys/my_alloc.c:
  More debugging
sql/item_func.cc:
  Cleanup new code
  Don't call insert_id() for last_insert_id(value) to avoid side effects
sql/item_subselect.cc:
  Fixed DBUG output
sql/sp_head.cc:
  Simple cleanup
sql/sql_lex.cc:
  Moved usage of arguments first in lex_start to make their usage clearer
  Remove sl->expr_list.deleete_elements() becasue:
  - It didn't do anything (delete_elements on a list of list is a no-op operation)
  - The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed
  when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list)
sql/sql_parse.cc:
  More DBUG entries

into mysql.com:/home/psergey/mysql-4.1-bug7816

into mysql.com:/home/psergey/mysql-5.0-bug7716


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_string.h:
  Auto merged

CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.


acinclude.m4:
  Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS -
  this is a special version of ZLIB_LIBS to use in mysql_config
configure.in:
  Remove NON_THREADED_CLIENT_LIBS which weren't really 
  NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead.
  AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now
  needed inside mysql_config.sh
scripts/Makefile.am:
  Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed 
  substitution list.
scripts/mysql_config.sh:
  We can't use CLIENT_LIBS as in case when we use the bundled zlib
  it has a reference to $(top_builddir)/zlib.
  libs and libs_r now need to be specified explicitly.
zlib/Makefile.am:
  Install libz.la in case it's used by MySQL: this way we guarantee
  that paths printed by mysql_config are valid in all cases.

Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end
of your program; it however sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending
your ability to talk to servers). So here I add two defines which should be more generic names. Our manual
mentions these functions only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.


include/mysql.h:
  Creating synonyms (defines): mysql_library_init for mysql_server_init, mysql_library_end for mysql_server_end;
  these new names are more generic, so suitable when using libmysqlclient as well as libmysqld.

when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.


mysql-test/r/drop_temp_table.result:
  result update (note: one DROP TEMPORARY TABLE per tmp table)
mysql-test/t/drop_temp_table.test:
  checking that we have one DROP TEMPORARY TABLE per tmp table now, not one multi-table DROP.
  Hiding columns Log_pos/End_log_pos per Monty's request.
sql/sql_base.cc:
  When we close the session's temp tables at session end, we automatically write to binlog one DROP TEMPORARY TABLE per tmp table, 
  not one single multi-table DROP TEMPORARY TABLE (because it causes problems if slave has --replicate*table rules).

mysql-test/r/func_group.result:
  Update results

client/mysqlcheck.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/field.cc:
  Clean up merge

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

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


sql/field.cc:
  Auto merged

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

into mysql.com:/home/mysqldev/tulin/mysql-4.1

into mysql.com:/home/mysqldev/tulin/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged