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

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

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

mysql-test/r/metadata.result:
  postmerge change
sql/item.cc:
  work around about varchar in 4.1

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

sql/sql_parse.cc:
  Auto merged

Fix 'Bootstrap' to bypass a problem with "bk changes" by changing the directory before calling the command.


Build-tools/Bootstrap:
  Bypass a BK problem with "bk changes": It stopped delivering changeset comments when
  1) it encountered a single, unbroken line with about 1k characters  AND
  2) it was applied not to the current directory but to a named BK root directory.
  
  As 1) cannot be changed post-factum (and might happen again),
  the "bk changes" command is now preceded by a "cd $REPO".
  
  Do some renaming of variables used around the "bk changes" call to improve documentation.

support-files/mysql.server.sh:
  Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
  Note that the "stop" method is still wrong, as it does not wait for file removal.

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


mysql-test/r/ps_7ndb.result:
  Auto merged

  Sedond attempt: Simply disallow CHECK in SPs, since it can't work.


mysql-test/r/sp-error.result:
  New test cast for BUG#6600
mysql-test/r/sp.result:
  Removed old test case for BUG#6600
mysql-test/t/sp-error.test:
  New test cast for BUG#6600
mysql-test/t/sp.test:
  Removed old test case for BUG#6600
sql/share/errmsg.txt:
  Made the SP bad statement error message more general.
sql/sp_head.cc:
  CHECK is not possible in stored procedures.
sql/sql_parse.cc:
  Undid attempt to fix CHECK in stored procedures, it didn't work.
sql/sql_yacc.yy:
  CHECK is not possible in stored procedures.
  (And updated error messages for LOCK/UNLOCK.)