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

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

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

  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool


sql/ha_innodb.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool
sql/ha_innodb.h:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
sql/mysqld.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.
sql/set_var.cc:
  BUG#12701: SHOW VARIABLES does not show correct size of buffer pool.

incorrect warning on open cursor"


sql/sql_prepare.cc:
  A fix for Bug#13524 "lock timeout gives incorrect 
  warning on open cursor": reset the connection for next
  command before performing a cursor fetch (add an omitted line).
tests/mysql_client_test.c:
  A test case for Bug#13524 "lock timeout gives incorrect 
  warning on open cursor"

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2

which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".


mysql-test/r/sp-error.result:
  Added test for bug #12329 "Bogus error msg when executing PS with stored
  procedure after SP was re-created".
mysql-test/r/trigger.result:
  Added test for bug #13399 Crash when executing PS/SP which should activate
  trigger which is now dropped".
mysql-test/t/sp-error.test:
  Added test for bug #12329 "Bogus error msg when executing PS with stored
  procedure after SP was re-created".
mysql-test/t/trigger.test:
  Added test for bug #13399 Crash when executing PS/SP which should activate
  trigger which is now dropped".
sql/sp_head.cc:
  sp_head::add_used_tables_to_table_list():
    We have to copy database/table names and alias to PS/SP memory since current
    instance of sp_head object can pass away before next execution of PS/SP for
    which tables are added to prelocking list.
    This will be fixed by introducing of proper invalidation mechanism once new
    TDC is ready.

function with a cursor". Enable execution of SELECT queries in SP on slave.


mysql-test/r/rpl_sp.result:
  Test results were fixed (Bug#14077).
mysql-test/t/rpl_sp.test:
  Add a test case for Bug#14077 "Failure to replicate a stored 
  function with a cursor".
sql/sql_parse.cc:
  Do not rewrite SELECTs with DOs on slave: if this SELECT was for a stored
  routine cursor, slave must be able to execute the SELECT in order to
  open a cursor.
  At the moment the bug is present only in stored functions and stored
  procedures called from stored functions, because, due to
  stored procedure unfolding for replication, top level stored procedures
  are never executed on slave.

into  mysql.com:/export/space/pekka/ndb/version/my50

into  mysql.com:/home/mydev/mysql-4.1-4100

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

After merge fix.

mysql-test/t/func_group.test:
  re-enable the test

into  mysql.com:/export/space/pekka/ndb/version/my50

into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1

mysql-test/r/ndb_charset.result:
  bug#14007 5.0
mysql-test/t/ndb_charset.test:
  bug#14007 5.0
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.hpp:
  bug#14007 5.0

Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)

The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.


mysql-test/r/sp-error.result:
  Test that statements which implicitly commit transaction
mysql-test/t/sp-error.test:
  Test that statements which implicitly commit transaction
sql/sp_head.cc:
  We set the new flag about commit/rollback statements presence
sql/sp_head.h:
  The new flag about commit/rollback presence added
  A comment fixed
sql/sql_yacc.yy:
  Removed commit/rollback-statement-present errors spread by this file, only one check left which check flags of a SP

  Auto merged


ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged

mysql-test/r/ndb_charset.result:
  bug#14007 test [re-commit]
mysql-test/t/ndb_charset.test:
  bug#14007 test [re-commit]
ndb/include/kernel/AttributeDescriptor.hpp:
  bug#14007 4.1 need getSizeInBytes [re-commit]
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]

into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/handler.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.