client/mysqldump.c:
  merged changes for bug #9175

into mdk10.(none):/home/reggie/bk/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


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

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Manual merge, fix already applied to 4.1

 - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

mysql-test/r/group_by.result:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
sql/item_cmpfunc.cc:
  merge
support-files/mysql.server.sh:
  merge

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


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/group_by.result:
  result change
mysql-test/r/union.result:
  result change
mysql-test/r/view.result:
  result change
mysql-test/t/subselect.test:
  fixed mistake of merge
sql/field.cc:
  new 5.0 types support
  temporary table/db names detection in field fixed
sql/field.h:
  removed non-existent methods
  added wrongly deleted during manual merge string
sql/item.cc:
  support of new types added to merge of union types routines
sql/item.h:
  fixed method definition
sql/item_cmpfunc.cc:
  fixed type
sql/item_func.h:
  item type name fixed
sql/item_subselect.cc:
  added forgoten methods
sql/item_subselect.h:
  fixed type
sql/sql_derived.cc:
  fixed typo of manual merge
sql/sql_view.cc:
  added new parameter

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/svoj/devel/mysql/mysql-5.0

openssl_1 and rpl_openssl results difference


mysql-test/r/openssl_1.result:
  Fix expected error messages.
mysql-test/r/rpl_openssl.result:
  Fix show slave status output. This fix makes rpl_openssl work with openssl-0.9.7 and yassl.
mysql-test/t/openssl_1.test:
  Fix expected error codes.

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

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed so no merge conflict with

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into mdk10.(none):/home/reggie/bk/mysql-4.1

mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned


client/mysqldump.c:
  Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned

ndb/include/util/Vector.hpp:
  fix small memory leak
ndb/src/mgmapi/mgmapi.cpp:
  fix small memory leak

into msdesk.mysql.com:/home/magnus/mysql-5.0

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

 - When deleting from a cursor the m_rows_changed variable was not properly incremented to indicate that m_share->commit_count should be cleared at end of trans.
  


sql/ha_ndbcluster.cc:
  Moved increment of m_rows_changed to higher up in the function.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

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

wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix  


support-files/mysql.server.sh:
  wait_for_pid function corrected to work properly with start/stop

into mysql.com:/usr/local/bk/mysql-5.0


sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

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


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

mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

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

platforms": yet another issue with floating pointer comparisons.
The fix uses the workaround with volatiles.


sql/item_cmpfunc.cc:
  A fix for the failing mysql_client_test on some Intel platforms
  when compiled with optimization.
  We don't use -ffloat-store compileation as it may slow all
  floating point operations.

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

Fixed that datetime gives warning for zero dates in traditional mode


mysql-test/r/strict.result:
  Enabled more tests of STR_TO_DATE()
mysql-test/t/strict.test:
  Enabled more tests of STR_TO_DATE()
sql/field.cc:
  Fixed that datetime gives warning for zero dates in traditional mode
sql/log_event.h:
  Fix wrong ifdef from last push

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ACC_LOCKREQ - element may have moved after lock request was made