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

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

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

sql/ha_archive.h:
  Removed unneeded include.

into  zim.(none):/home/brian/mysql/archive-5.1

mysql-test/r/archive.result:
  New result file.
mysql-test/t/archive.test:
  Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
  Changed comparision function to compare memory locations. 
  
  Modified function for storing the auto_increment. 
  Removed useless DBUG_PRINT

  Fix word.
  (no test results needed fixing)


sql/share/errmsg.txt:
  Fix word.
  (no test results needed fixing)

into  linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups


sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  accepted Mat's changes to the template defs

into  zim.(none):/home/brian/mysql/archive-5.1

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


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

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

configure.in:
  1) Update version, now that 5.1.5 has been cloned.
  2) Get rid of erroneous merge, NDB version is deduced automatically from global version.

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/my51-yassl_link_problem

sql/log.cc:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.
sql/log_event.h:
  Preprocessor symbol NO_FLAGS used by system on HP-UX.

into  mysql.com:/users/mkindahl/bk/fix-mysql-5.1-new

sql/log_event.h:
  Adding enumeration constants since aCC (HP-UX) does not like empty enumerations.
sql/sql_class.cc:
  Adding template parameter as argument to member template function to support aCC on HP-UX.
sql/sql_class.h:
  Adding template parameter as argument to member template function to support aCC on HP-UX.

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-max

This changeset adds support for autoincrements to archive. It allows it to have them with both unique and non-unique indexes. 
Test cases will come in the next push (just doing this one so I can get a couple of reviews in). This is not the final patch. 


sql/field.h:
  Added val_int() method similar to the one like val_str() that will allow you to pop in another pointer and do a test.
sql/ha_archive.cc:
  Adds auto_increment support to archive. Cleans up a number of other small items.
sql/ha_archive.h:
  More additions for support of autoincrements

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

of static for referenged function.

 - 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 ""

into  mysql.com:/users/mkindahl/bk/b15923-mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sql_delete.cc:
  Auto merged

  Always log statements "DELETE FROM x" statement-based. 


sql/sql_delete.cc:
  Logging deletion of all rows using statement-based logging.

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

into  mysql.com:/space/pekka/ndb/version/my51

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

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


sql/sql_select.cc:
  Auto merged

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.

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

The patch adds DYNAMIC_ARRAY all_status_vars, which is now the
sole source of status information for SHOW STATUS.  Status
variables can be added to and removed from the array dynamically.
SHOW STATUS command uses this array instead of static array
from mysqld.cc
Compatibility with the old, global list of status variables is
preserved in init_server_components(), where this global list is
simply appended to all_status_vars.


include/plugin.h:
  WL#2935 - SHOW STATUS support in plugins
plugin/fulltext/plugin_example.c:
  WL#2935 - SHOW STATUS support in plugins
  example
sql/ha_innodb.cc:
  s/struct show_var_st/SHOW_VAR/
sql/ha_innodb.h:
  s/struct show_var_st/SHOW_VAR/
sql/mysql_priv.h:
  WL#2935 - SHOW STATUS support in plugins
  add_status_vars(), remove_status_vars()
sql/mysqld.cc:
  bug: plugin_free must be called even with --skip-grants
  add_status_vars()/free_status_vars(), remove unused SHOW_xxx_CONST
  s/struct show_var_st/SHOW_VAR/
sql/set_var.cc:
  s/struct show_var_st/SHOW_VAR/
sql/sql_parse.cc:
  s/struct show_var_st/SHOW_VAR/
sql/sql_plugin.cc:
  WL#2935 - SHOW STATUS support in plugins
sql/sql_plugin.h:
  WL#2935 - SHOW STATUS support in plugins
sql/sql_show.cc:
  WL#2935 - SHOW STATUS support in plugins
  DYNAMIC_ARRAY all_status_vars, add_status_vars(), remove_status_vars()
  s/struct show_var_st/SHOW_VAR/
sql/structs.h:
  WL#2935 - SHOW STATUS support in plugins
  SHOW STATUS definitions moved to include/plugin.h and sql_plugin.h
  s/struct show_var_st/SHOW_VAR/

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


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

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.

mysql-test/r/binlog_stm_blackhole.result:
  Update results