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


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

Fix merge errors


mysql-test/r/mysql_upgrade.result:
  Update result file for mysql_upgrade
mysql-test/r/mysqldump.result:
  Merge error
mysql-test/r/rpl_drop_db.result:
  Merge error
mysql-test/r/rpl_row_max_relay_size.result:
  Merge error
mysql-test/t/rpl_drop_db.test:
  Merge error

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


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/r/rpl_drop_db.result:
  Manual merge
mysql-test/r/rpl_variables.result:
  Manual merge
mysql-test/t/rpl_drop_db.test:
  Manual merge
mysql-test/t/rpl_sp.test:
  Manual merge
mysql-test/t/rpl_timezone.test:
  Manual merge
mysql-test/t/rpl_variables.test:
  Manual merge

mysql-test/r/init_connect.result:
  Restore global variable to the value it's set to when server is started
mysql-test/r/key_cache.result:
  Restore global variable values to original
mysql-test/r/mysqldump.result:
  Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%"
mysql-test/r/rpl_deadlock.result:
  Restore global variable values to original
mysql-test/r/rpl_drop_db.result:
  Remove the conflicting file and drop database mysqltest1 before test exits
mysql-test/r/rpl_ignore_revoke.result:
  As changes to mysql.* are ignored - explicitly delete the user on slave
mysql-test/r/rpl_init_slave.result:
  Restore global variable values to original
mysql-test/r/rpl_max_relay_size.result:
  Restore global variable values to original
mysql-test/r/rpl_sp.result:
  Restore global variable values to original
mysql-test/r/rpl_timezone.result:
  Restore global variable values to original
mysql-test/r/rpl_variables.result:
  Restore global variable values to original
mysql-test/r/view_grant.result:
  Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost"
mysql-test/t/init_connect.test:
  Restore global variable to the value it's set to when server is started
mysql-test/t/key_cache.test:
  Restore global variable values to original
mysql-test/t/mysqldump.test:
  Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%"
mysql-test/t/rpl_deadlock.test:
  Restore global variable values to original
mysql-test/t/rpl_drop_db.test:
  Remove the conflicting file and drop database mysqltest1 before test exits
mysql-test/t/rpl_ignore_revoke.test:
  As changes to mysql.* are ignored - explicitly delete the user on slave
mysql-test/t/rpl_init_slave.test:
  Restore global variable values to original
mysql-test/t/rpl_max_relay_size.test:
  Restore global variable values to original
mysql-test/t/rpl_sp.test:
  Restore global variable values to original
mysql-test/t/rpl_timezone.test:
  Restore global variable values to original
mysql-test/t/rpl_variables.test:
  Restore global variable values to original
mysql-test/t/view_grant.test:
  Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost"

into  example.com:/work/bug23760/my51

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

mysql-test/r/limit.result:
  Add missing drop of table t1
mysql-test/r/lowercase_fs_off.result:
  Add missing drop of "sample" user
mysql-test/t/limit.test:
  Add missing drop of table t1
mysql-test/t/lowercase_fs_off.test:
  Add missing drop of "sample" user

into  example.com:/work/bug23760/my51


mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge

The problem was that THD::row_count_func was zeroed too. It was zeroed
as a fix for bug 4905 "Stored procedure doesn't clear for "Rows affected"
However, the proper solution is not to zero, because THD::row_count_func has
been set to -1 already in mysql_execute_command(), a later fix, which obsoletes
the incorrect fix of #4095


mysql-test/r/sp.result:
  update result
mysql-test/t/sp.test:
  test for bug#23760 ROW_COUNT() and store procedure not owrking together
sql/sql_parse.cc:
  Remove zeroing for thd->row_count_func
  The fix for #4905 wasn't right. Now, it's ok without this zeroing
  because if there was an error THD::

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint

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.