sql/item_sum.cc:
  Fix for bug #10966: Variance functions return wrong data type.
  Always return Field_double if no grouping.

into mysql.com:/M50/mysql-5.0


client/mysqldump.c:
  Auto merged

  Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.


sql/item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
mysql-test/r/cast.result:
  Fixing test results accordingly.

into  mysql.com:/usr/home/bar/mysql-5.0.b14255

cast.result:
cast.test:
  Avoid 0x00 byte in test results, use HEX instead.


mysql-test/t/cast.test:
  Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad
  Avoid 0x00 byte in test results, use HEX instead.
mysql-test/r/cast.result:
  Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad

into  mysql.com:/home/eric/fed-err-mysql-5.0

(Patch provided by serg)


config/ac-macros/zlib.m4:
  Check for zlib with a zzlibCompileFlags() function.
  This makes it pick the bundled zlib if there's an old installed version
  (which wouldn't work).

into  mysql.com:/home/eric/fed-err-mysql-5.0

client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_open.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
configure.in:
  Manual merge - new version (17) takes precedence.

into  mysql.com:/usr/home/bar/mysql-5.0.b14255


sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.0-14554

 statement for tables created in the IGNORE_SPACE sql mode.


client/mysqldump.c:
  Modified dump_triggers_for_table(): if trigger statement returned
   by SHOW TRIGGERS query does not contain a leading white space,
   additional space is inserted between "ROW" and the statement.
   The leading white spaces are removed by yylex() in the
   IGNORE_SPACE sql mode.
mysql-test/r/mysqldump.result:
  Fixed test case result for bug 14554.
mysql-test/t/mysqldump.test:
  Added test case for bug 14554.

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825

COUNT(*) is 0" (the test case has been pushed already)


sql/sql_cursor.cc:
  Fix a return of an unitialized variable: return_zero_rows
  checks the return value of send_fields and in case it's 1
  doesn't call send_data. This caused creation of an empty result 
  set for the case when there is a cursor against a select with a 
  group function and no matching rows.

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825


sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

handling of savepoints in stored routines.

Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
functions to properly handle savepoints inside of stored functions and
triggers.
Also now when we invoke stored function or trigger we create new savepoint
level. We destroy it at the end of function/trigger execution and return back
to old savepoint level.


mysql-test/r/sp_trans.result:
  Added test for bug #13825 "Triggers: crash if release savepoint" and for
  general handling of savepoints in stored routines.
mysql-test/t/sp_trans.test:
  Added test for bug #13825 "Triggers: crash if release savepoint" and for
  general handling of savepoints in stored routines.
sql/ha_innodb.cc:
  innobase_savepoint():
    Replaced check which always failed due to similar check in caller
    with assertion.
sql/handler.cc:
  ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint():
    Changed functions to properly support handling of savepoints
    inside of stored functions and triggers.
sql/sql_class.cc:
  THD::reset_sub_statement_state()/restore_sub_statement_state():
    When we invoke stored function or trigger we should create new savepoint
    level. We should destroy it at the end of function/trigger execution and
    return back to old savepoint level. To support this behavior we should
    save and reset list of current savepoints on entering function and restore
    old list when we leave it.
sql/sql_class.h:
  Sub_statement_state:
    When we invoke stored function or trigger we should create new savepoint
    level. We should destroy it at the end of function/trigger execution and
    return back to old savepoint level. To support this behavior added "savepoint"
    member which is used to save/restore list of current savepoints on
    entering/leaving function.
sql/sql_parse.cc:
  mysql_execute_command():
    Changed processing of SQLCOM_SAVEPOINT so now it is not ignored when
    we are in autocommit mode and savepoint is set inside of stored
    function or trigger.

password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.


mysql-test/r/sp-error.result:
  Test results fixed: a new test for Bug#13510
mysql-test/t/sp-error.test:
  A new test for Bug#13510 (set names out of an SP)
sql/sql_yacc.yy:
  Bug#13510: fix the case when there is no stored procedure or
  no 'names' variable declared. Return a syntax error in this case.

a UNION in which case returns BLOB". The bug is not present anymore.


mysql-test/r/func_gconcat.result:
  Bug#8568: test results
mysql-test/t/func_gconcat.test:
  Add a test case for Bug#8568

into moonbone.local:/work/13622-bug-5.0-mysql

client/mysql.cc:
  Fixed option.
client/mysqladmin.cc:
  Fixed option.
client/mysqlbinlog.cc:
  Fixed option.
client/mysqlcheck.c:
  Fixed option.
client/mysqldump.c:
  Fixed option.
client/mysqlimport.c:
  Fixed option.
client/mysqlshow.c:
  Fixed option.
configure.in:
  Changed version for Netware.
myisam/myisamchk.c:
  Fixed option.
myisam/myisampack.c:
  Fixed option.
netware/mysql_test_run.c:
  NetWare specific changes:
  Define MYSQL_CHECK environment variable to make mysqlcheck test case pass

when COUNT(*) is 0". The bug itself cannot be repeated.


mysql-test/r/sp.result:
  Test results were fixed (Bug#14845)
mysql-test/t/sp.test:
  An SQL language test case for Bug#14845
tests/mysql_client_test.c:
  A test case for Bug#14845

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


mysql-test/t/ndb_alter_table.test:
  Auto merged

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into moonbone.local:/work/13622-bug-5.0-mysql


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

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Enabled view tests that didn't work before.


mysql-test/r/view.result:
  Enabled natural outer join tests with views - now they work after WL#2486 was pushed.
mysql-test/t/view.test:
  Enabled natural outer join tests with views - now they work after WL#2486 was pushed.

mysql-test/r/mix_innodb_myisam_binlog.result:
  update results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Update binlog test

sql/sql_view.cc:
  Auto merged

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


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Resolve conflict
sql/item_func.cc:
  Resolve conflict
sql/sql_show.cc:
  Resolve conflicts

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

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


configure.in:
  Auto merged

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

sql/sql_prepare.cc:
  Post-review fixes (Bug#13524): make sure 
  mysql_reset_thd_for_next_command is called first for
  all PS commands.

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

sql/ha_federated.cc:
  remove superfluous local variable.