sql/sql_select.cc:
  reset the group functions and copy the values of the first row before exiting because of
  maximal number of rows has been read for this cursor fetch. the additional variable is needed
  to save code duplication.
tests/mysql_client_test.c:
  test for bug #11904 (cursor grouping wrong result)

into lmy004.:/work/mysql-5.0-bug12533-2


mysql-test/r/view.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/view.result:
  result of test for bug #12533
mysql-test/t/view.test:
  test for bug #12533 (crash on DESCRIBE <view> after renaming base table column)
sql/sql_show.cc:
  close thread tables even if process_table bails out

into lmy004.:/work/mysql-5.0-clean

into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0_5501


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

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

for building with --without-server.


configure.in:
  Re-add mysys to sql_server_dirs, so it is built before dbug.

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


configure.in:
  Auto merged
sql/hostname.cc:
  Resolve conflict

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

datetime of when the current statement began. This also makes SYSDATE()
not safe in replication. (Bug #12562)


mysql-test/r/func_time.result:
  Add new results
mysql-test/t/func_time.test:
  Add tests for new SYSDATE() behavior
sql/item_timefunc.cc:
  Add Item_func_sysdate_local implementation
sql/item_timefunc.h:
  Add Item_func_sysdate_local, so SYSDATE() can behave differently
  than NOW().
sql/lex.h:
  SYSDATE() is no longer an alias for NOW().
sql/sql_yacc.yy:
  Handle SYSDATE()

into  mishka.local:/home/my/mysql-5.0


sql/sql_base.cc:
  Auto merged

Removed ASSERT that can obviously never be wrong

into  mysql.com:/home/dlenev/src/mysql-5.0.12

We should not assume that "thd" argument of reload_acl_and_cache() is
non-zero. Failure to do so will cause server to crash when one sends
SIGHUP to it.


sql/sql_parse.cc:
  reload_acl_and_cache():
    When we call this function from SIGHUP handler we pass 0 as "thd" argument
    to it. So we should not assume that thd is non-zero in it.

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

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

mysql-test/r/information_schema.result:
  changed output "view" to uppercase
mysql-test/r/view.result:
  changed output "view" to uppercase
sql/sql_show.cc:
  changed table field "view" to uppercase

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

sql/log_event.cc:
  my_malloc can be a macro

mysql-test/r/sp.result:
  fix result
mysql-test/t/sp.test:
  fix test for a bug: tests in sp.test should reuse tables t1 and t2 and create/drop tables t3, t4 etc.
  So, tables t1 and t2 were renamed into t3 and t4

into  mysql.com:/home/timka/mysql/src/5.0-2486

sql/sql_base.cc:
  Fixed a bug in PS (prepared statements) mode - the "always TRUE" constant
  Item created for outer joins with no common columns was not created in
  the PS memory.
  Now it is created in the right memory.

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

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

into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin

sql/sp_head.cc:
  fix #ifndef ... #endif to include block completely

sql/log_event.cc:
  Review fixes
sql/sql_parse.cc:
  Review fixes

into  mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532


sql/log_event.cc:
  Auto merged

The bug itself is fixed by WL#2486.


mysql-test/r/select.result:
  Test for BUG#6495.
mysql-test/t/select.test:
  Test for BUG#6495.

configure.in:
  Fix directories built using --without-server, and add mf_keycache.o
  to list of objects only built for thread-safe library, since it requires
  threading.
dbug/my_main.c:
  Don't try to initialize thread globals if not built with threading.
mysys/Makefile.am:
  Remove mf_keycache.c from list of files to build (it will be included
  in THREAD_LOBJECTS when appropriate).
mysys/mf_getdate.c:
  Fix usage of gmtime().
sql/share/Makefile.am:
  Allow removal of mysqld_error.h to fail, in case it doesn't exist yet.
tests/Makefile.am:
  Don't link against libmysys explicitly.

due to incorrect transformation to JOIN ... ON.

The bug itself is fixed by WL#2486.


mysql-test/r/select.result:
  Test for BUG#4889.
mysql-test/t/select.test:
  Test for BUG#4889.

mysql-test/r/select.result:
  Test for BUG#6276.
mysql-test/t/select.test:
  Test for BUG#6276.
sql/sql_base.cc:
  Add a true ON condition for outer joins without common columns.

The bug itself is fixed by WL#2486.


mysql-test/r/select.result:
  Test case for BUG#10972.
mysql-test/t/select.test:
  Test case for BUG#10972.

into  mysql.com:/home/timka/mysql/src/5.0-2486


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.0-dbg

into  mysql.com:/home/timka/mysql/src/5.0-2486


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

* Provide backwards compatibility extension to name resolution of
  coalesced columns. The patch allows such columns to be qualified
  with a table (and db) name, as it is in 4.1.
  Based on a patch from Monty.

* Adjusted tests accordingly to test both backwards compatible name
  resolution of qualified columns, and ANSI-style resolution of
  non-qualified columns.
  For this, each affected test has two versions - one with qualified
  columns, and one without. 


mysql-test/include/ps_query.inc:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/bdb.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/innodb.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/join.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/join_nested.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/join_outer.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/null_key.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/order_by.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_2myisam.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_3innodb.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_4heap.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_5merge.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_6bdb.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/ps_7ndb.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/select.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/subselect.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/r/type_ranges.result:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/bdb.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/innodb.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/join.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/join_nested.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/join_outer.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/null_key.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/order_by.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/select.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/subselect.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
mysql-test/t/type_ranges.test:
  Put back old tests to test that coalesced columns of natural joins can be qualified.
sql/sql_base.cc:
  * Applied Monty's patch for backwards compatible name resolution
    of qualified columns. The idea is:
    - When a column is qualified, search for the column in all
      tables/views underlying each natural join. In this case
      natural joins are *not* considered leaves.
    - If a column is not qualified, then consider natural joins
      as leaves, thus directly search the result columns of
      natural joins.
  * Simplified 'find_field_in_tables()' - unified two similar
    loops into one.
sql/table.cc:
  - Removed method & members not needed after Monty's patch.
sql/table.h:
  - Removed method & members not needed after Monty's patch.
tests/mysql_client_test.c:
  Put back old tests to test that coalesced columns of natural joins can be qualified.

into lmy004.:/work/mysql-5.0-clean


mysql-test/r/rpl_delete_all.result:
  Auto merged
mysql-test/t/rpl_delete_all.test:
  Auto merged

mysql-test/lib/init_db.sql:
  this should be longblob or info_schema test will fail
mysql-test/r/rpl_delete_all.result:
  fix result of a test, the error message is different (bug #12591)
mysql-test/t/rpl_delete_all.test:
  fix test, now the error code is different (bug #12591)