into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
sql/item_func.cc:
  Auto merged
mysql-test/Makefile.am:
  Use local

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


mysql-test/Makefile.am:
  Manual merge

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run-shell.sh:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/collapsed:
  auto-union
sql/item_func.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
sql/item_func.cc:
  Auto merged

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


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
Makefile.am:
  Manual merge

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/udf_example.c:
  Auto merged

The code that set up data to be passed to user-defined functions was very
old and analyzed the "Type" of the data that was passed into the UDF, when
it really should analyze the "return_type", which is hard-coded for simple
Items and works correctly for complex ones like functions.
---
Added test at Sergei's behest.


mysql-test/r/udf.result:
  Verify that various arguments work.
  ---
  Added test at Sergei's behest.
mysql-test/t/udf.test:
  Verify that various arguments work.
  ---
  Added test at Sergei's behest.
sql/item_func.cc:
  For function-Items, test whether it is constant and set the struct members 
  for the UDF parameter appropriately.
  
  Replace tabs with spaces in affected code.
sql/udf_example.c:
  Include a simple function that is useful in testing.

mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Remove build of mysql_test_run_new
  Symlink mysql-test-run.pl to mysql-test-run
  Rename mysql-test-run.sh to mysql-test-run-shell.sh

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
vio/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
client/Makefile.am:
  Use local
tests/Makefile.am:
  SCCS merged

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

 - Most likely caused by linking with libmysqlclient using gcc and not g++.
 - Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
   with gcc 
 - Remove build of non working test programs in vio


client/Makefile.am:
  Remove "yassl_dummy_link_fix"
tests/Makefile.am:
  Remove "yassl_dummy_link_fix"
tools/Makefile.am:
  Remove "yassl_dummy_link_fix"
vio/Makefile.am:
  Remove "yassl_dummy_link_fix"
  Remove non working test programs from being built

result from "require mysql_upgrade"


mysql-test/r/have_mysql_upgrade.result:
  New BitKeeper file ``mysql-test/r/have_mysql_upgrade.result''

in Makefile.am.


client/Makefile.am:
  by default, if there is no _SOURCES line, it is assumed that the source
  is a .c file. So for mysqladmin, we really need the _SOURCES line.

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


client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql-common/my_time.c:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-abi_check.ic:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


BitKeeper/deleted/.del-abi_check.ic:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge

Add new test file mysql_upgrade.test


BitKeeper/deleted/.del-abi_check.ic:
  Rename: include/abi_check.ic -> BitKeeper/deleted/.del-abi_check.ic
client/mysql_upgrade.c:
  Make mysql_upgrade search also in "client" dir so it can be run from a source dist.
mysql-test/mysql-test-run.pl:
  Make it possible for .test scripts to run "mysql_upgrade"
mysql-test/r/mysql_upgrade.result:
  New BitKeeper file ``mysql-test/r/mysql_upgrade.result''
mysql-test/t/mysql_upgrade.test:
  New BitKeeper file ``mysql-test/t/mysql_upgrade.test''

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

- Cleanup the Makefile for client
- Don't link mysqltest with mysys as it's been compiled with different flags.


client/Makefile.am:
  Cleanup the Makefile for client
  Don't link mysqltest with mysys as it's been compiled with different flags.

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


include/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

use MTR_MEM environment variable

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860


BitKeeper/etc/collapsed:
  auto-union
sql/mysqld.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
sql/mysqld.cc:
  manual merge

Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.


sql/mysqld.cc:
  On a crash when --memlock was active, emit advice about the insta-
  bility of that parameter.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my51-mtr_winfix


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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix


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

Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 


mysql-test/mysql-test-run.pl:
  Defined global variable.