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

mysql-test/r/ctype_utf8.result:
  Correct wrong merge
mysql-test/r/show_check.result:
  Correct wrong merge
  Fix output from new test for SHOW CREATE TABLE, default '0' is not displayed in 5.0
mysql-test/r/sql_mode.result:
  Correct wrong merge

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/item_func.cc:
  Item_real_func::val_decimal implemented
sql/item_func.h:
  Item_real_func::val_decimal declared

mysql-test/t/show_check.test:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge(without filemerge tool!)
mysql-test/r/show_check.result:
  Manual merge
mysql-test/r/sql_mode.result:
  Manual merge
sql/sql_show.cc:
  Manual merge

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  new_point can be 0, and this case should be handled separately

  - Change output from SHOW CREATE TABLE to use USING instead of TYPE


mysql-test/r/ctype_utf8.result:
  Update test results
mysql-test/r/show_check.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/t/show_check.test:
  Add test for BUG#11635
sql/sql_show.cc:
  Change TYPE to USING as output from SHOW CREATE TABLE

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


sql/item_strfunc.cc:
  Auto merged

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


VC++Files/tests/mysql_client_test.dsp:
  Merge with fix to link debug version against debug yassl library

sql/ha_federated.cc:
  Fix typo
sql/sql_insert.cc:
  Fix typo

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

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


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/item_strfunc.cc:
  SCCS merged

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

  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables


mysql-test/mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop

the new installer and GUI tools expect. (Bug #10419) Also, dynamically bind to
GetSystemWindowsDirectory() so that it works on all platforms. (Bug #5354)


mysys/default.c:
  Dynamically bind to GetSystemWindowsDirectory() or emulate it, and also look
  in directory above the executable to find my.cnf/ini on Windows.

into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0

  Added a test case for bug #6120.
sql_view.cc:
  Fixed bug #6120.
  The SP cache must be invalidated when a view is altered.


sql/sql_view.cc:
  Fixed bug #6120.
  The SP cache must be invalidated when a view is altered.
mysql-test/t/view.test:
  Added a test case for bug #6120.
mysql-test/r/view.result:
  Added a test case for bug #6120.

mysql-test/mysql-test-run.pl:
  Auto merged

  Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories


VC++Files/tests/mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
  Handle case where SHELL isn't set in Cygwin

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


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

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

into mysql.com:/space/my/mysql-4.1

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

into mysql.com:/space/my/mysql-5.0-build

scripts/make_binary_distribution.sh:
  - manual merge

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

into mysql.com:/space/my/mysql-4.1-build


scripts/make_binary_distribution.sh:
  Auto merged

  all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script

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

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

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

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


client/mysqldump.c:
  Auto merged

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


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

into mysql.com:/space/my/mysql-4.1

into hundin.mysql.fi:/home/marko/mysql-5.0-current

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

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

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


include/my_global.h:
  Auto merged