sql/sql_class.cc:
  Improved documentation on add_to_status().
sql/sql_parse.cc:
  Changed refresh status to take thd as argument to avoid current_thd.
  Removed add_to_status away from loop, as it is not necessary for each
  variable, only required for each thread. In this case only the current
  thread.

client/mysqltest.c:
  Allocate one extra byte for string terminator in varname

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration

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

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"

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

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


sql/sql_acl.cc:
  Auto merged

- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""


mysql-test/r/grant.result:
  Update test results
mysql-test/t/grant.test:
  Add test for user with host ""

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

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


mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/grant.result:
  SCCS merged

 - When acl_user->host.hostname is NULL compare it as ""


mysql-test/r/grant.result:
  Test user with host ''
mysql-test/t/grant.test:
  Test user with host ''
sql/sql_acl.cc:
  If acl_user->host.hostname is NULL compare it as ""

Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)


config/ac-macros/yassl.m4:
  Symlink extra/yassl/include/openssl dir to include/
include/Makefile.am:
  Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
  Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)

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

ndb/test/ndbapi/test_event_merge.cpp:
  5.0 passes. 5.1 has many problems

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


mysql-test/t/having.test:
  Auto merged
mysql-test/r/having.result:
  Manual merge.
sql/sql_select.cc:
  Manual merge.

Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.


mysql-test/r/having.result:
  Added a test case for bug #14274.
mysql-test/t/having.test:
  Added a test case for bug #14274.
sql/sql_select.cc:
  Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set.
  It happened because processing of the set functions in having started with a call of the split_sum_func
  method, instead of the split_sum_func2 method.

mysql-test/r/view.result:
  Added a test case for bug #16016.
mysql-test/t/view.test:
  Added a test case for bug #16016.
sql/opt_sum.cc:
  Fixed bug #16016: MIN/MAX optimization was not applied to views.
  The fix employs the standard way of handling direct references to view fields.

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
mysql-test/r/bdb.result:
  Resolve conflict
mysql-test/t/bdb.test:
  Resolve conflict

sql/sql_handler.cc:
  Move lock tables before conditions as lock tables may reopen tables
sql/sql_trigger.cc:
  After merge fix

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


mysql-test/r/create.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_trigger.cc:
  Manual merge

- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null


mysql-test/r/create.result:
  Update results after removing wrong warnings for CREATE ... SELECT
  New tests
mysql-test/r/handler.result:
  Drop used tables
mysql-test/r/kill.result:
  Make test portable
mysql-test/r/mysqlshow.result:
  Drop tables used by previous test
mysql-test/r/trigger.result:
  Reuse old procedure name
mysql-test/r/view.result:
  Extra tests
mysql-test/t/create.test:
  New tests to test fix of removing wrong warnings for CREATE ... SELECT
mysql-test/t/disabled.def:
  Enable 'kill' test (should now be portable)
mysql-test/t/handler.test:
  Drop used tables
mysql-test/t/kill.test:
  Make test portable even if kill doesn't work at once
mysql-test/t/mysqlshow.test:
  Drop tables used by previous test
mysql-test/t/trigger.test:
  Reuse old procedure name
mysql-test/t/view.test:
  Extra tests
sql/field.cc:
  Removed compiler warning
sql/ha_federated.cc:
  my_snprintf -> strmake()
  (Simple optimization)
sql/ha_ndbcluster.cc:
  Indentation cleanups and trival optimization
sql/item.cc:
  Moved save_org_in_field() to item.cc to make it easier to test
  Remove setting of null_value as this is not needed
sql/item.h:
  Moved save_org_in_field() to item.cc to make it easier to test
sql/log_event.cc:
  Remove inline of slave_load_file_stem()
  Added 'extension' parameter to slave_load_file_stem() to get smaller code
  Removed not critical (or needed) DBUG_ASSERT()'s
  Cleaned up usage of slave_load_file_stem() to not depend on constant string lengths
  Indentation fixes
sql/opt_range.cc:
  Moved code from declaration to function body
  (To make it more readable)
sql/parse_file.cc:
  Fixed DBUG_PRINT
sql/sp.cc:
  Simple cleanups
  - Removed not needed {} level
  - Ensure saved variables starts with old_
sql/sp_head.cc:
  Indentation fixes
  Remove core dump when using --debug when m_next_cached_sp == 0
  Fixed compiler warnings
  Trivial optimizations
sql/sp_head.h:
  Changed argument to set_definer() to const
  Added THD argument to recursion_level_error() to avoid call to current_thd
sql/sql_acl.cc:
  Removed not needed test (first_not_own_table is the guard)
sql/sql_base.cc:
  Removed extra empty line
sql/sql_handler.cc:
  Don't test table version in mysql_ha_read() as this is already tested in lock_tables()
  Moved call to insert_fields to be after lock_table() to guard aganst reopen of tables
  (Better fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash)
sql/sql_insert.cc:
  Mark fields that are set in CREATE ... SELECT as used
  (Removed wrong warnings about field not having a default value)
sql/sql_parse.cc:
  Removed not needed test of 'tables' (first_not_own_table is the guard)
  Simplify code
sql/sql_select.cc:
  Use group->field to check if value is null instead of item called by 'save_org_in_field'
  This is a better bug fix for #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null)
sql/sql_trigger.cc:
  Move sql_modes_parameters outside of function
  Indentation fixes
  Fixed compiler warning
  Ensure that thd->lex->query_tables_own_last is set properly before calling check_table_access()
  (This allows us to remove the extra test in check_grant() and check_table_access())

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


include/config-win.h:
  Auto merged

include/config-win.h:
  Port to Win64/x64 in Visual Studio 2005.
  Avoid endless deprecation warnings.

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


sql/handler.cc:
  Auto merged

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

into  mysql.com:/opt/local/work/mysql-5.0-merge

sql/sql_acl.cc:
  A post-merge fix.
sql/sql_base.cc:
  A post-merge fix.

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

parent when we are not the process group leader.

into  mysql.com:/opt/local/work/mysql-5.0-merge


mysys/hash.c:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_acl.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.

when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.


include/hash.h:
  - remove current_record from HASH, instead modify hash_first,
  hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter
mysys/hash.c:
  - remove HASH::current_record
  - change declarations of functions that use HASH in read-only mode
    to accept const HASH * instead of HASH *. 
  - implement hash_search; move the old implementation of hash_search
  to hash_first
mysys/testhash.c:
  - adjust the test case to changed function declarations
sql/lock.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_acl.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_base.cc:
  - adjust to changed declarations of hash_search, hash_nex
sql/sql_cache.cc:
  - adjust to a changed declaration of hash_replace

the bug is fixed.


mysql-test/r/rpl_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.

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

  enable view prepared mode during getting metedata for I_S table


mysql-test/r/information_schema.result:
  Fix for bug#15533 crash, information_schema, function, view
    test case
mysql-test/t/information_schema.test:
  Fix for bug#15533 crash, information_schema, function, view
    test case