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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0

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


scripts/mysql_fix_privilege_tables.sql:
  Auto merged

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

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


sql/mysqld.cc:
  Auto merged

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0

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

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0

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

into  mysql.com:/home/mysql_src/mysql-5.0-release

Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).


mysql-test/mysql-test-run.pl:
  update to new option name
mysql-test/mysql-test-run.sh:
  update to new option name
mysql-test/mysql_test_run_new.c:
  update to new option name
mysql-test/r/rpl_sp.result:
  result update
mysql-test/t/rpl_sp-slave.opt:
  we need to skip this error to not hit BUG#14769
mysql-test/t/rpl_sp.test:
  Test update:
  1) as log-bin-trust-routine-creators now affects only functions, the testing of this option, which was
  mainly done on procedures, is moved to functions
  2) cleanup is simplified; and instead of many SHOW BINLOG EVENTS we do a big one in the end, which is more
  maintainable.
  3) we test a few more function and procedures cases to see how they replicate.
  4) removing out-of-date comments
sql/item_func.cc:
  This warning is wrong since binlogging of functions was changed in August. If a function fails
  in the middle, it will be binlogged with its error code (i.e. properly).
sql/mysql_priv.h:
  variable name changed
sql/mysqld.cc:
  option name changes. A precision about --read-only.
sql/set_var.cc:
  a new class sys_var_trust_routine_creators to be able to issue a "this is a deprecated variable" warning if used.
sql/set_var.h:
  new class to be able to issue a "this is a deprecated variable" warning if used.
sql/share/errmsg.txt:
  routine -> function
sql/sp.cc:
  log-bin-trust-routine-creators now applies only to functions.
sql/sql_parse.cc:
  1) sending ER_FAILED_ROUTINE_BREAK_BINLOG is wrong since August as we don't binlog CALL anymore but instead binlog the substatements;
  the clear_error() goes away too as it was necessary only when we created a binlog event from the "CALL" statement.
  2) log-bin-trust-routine-creators now applies only to functions.
sql/sql_trigger.cc:
  comments.

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

mysql-test/r/ps_1general.result:
  Remove binlog from visable engine list.
sql/handler.h:
  Added documentation to HTON's
sql/log.cc:
  binlog now has hidden flag show that it does now show up in show storage engine list.
sql/sql_show.cc:
  Flag removes engines from view in show storage engines

into mysql.com:/home/hf/work/mysql-5.0.14268

mysql-test/t/mysqldump.test:
  Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong.
  2>&1 added to be able to see error messages.

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0

into  mysql.com:/home/mysql_src/mysql-4.1

into  mysql.com:/home/mysql_src/mysql-5.0-release


sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged

"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.


sql/item_func.h:
  declaring some class members public for BUG#12377
sql/item_strfunc.h:
  declaring some class members public for BUG#12377
sql/item_timefunc.h:
  declaring some class members public for BUG#12377

sql/sql_cursor.cc:
  A post-review fix for Bug#13488

(Currently, affects only BSD with Linuxthreads)

strings/decimal.c:
  Auto merged

into  mysql.com:/usr/home/pem/bug14719/mysql-5.0

gives MYSQL_DATA_TRUNCATED"


sql/sql_cursor.cc:
  A partial fix for Bug#13488 "Left outer join query incorrectly gives 
  MYSQL_DATA_TRUNCATED": send the correct metadata of the cursor
  result set at execute. The full fix would be to make sure that
  the metadata doesn't change between prepare and execute.
tests/mysql_client_test.c:
  A test case for Bug#13488 "Left outer join query incorrectly gives 
  MYSQL_DATA_TRUNCATED"

  Corrected the syntax for the current_user() case.
  (It's "definer = current_user[()]", not just "current_user[()]".)


mysql-test/r/view.result:
  New test case for BUG#14719
mysql-test/t/view.test:
  New test case for BUG#14719
sql/sql_yacc.yy:
  Corrected the CREATE VIEW syntax for the current_user() DEFINER case.
  (It's "definer = current_user[()]", not just "current_user[()]".)

into mysql.com:/M50/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-nov08-push

into mysql.com:/M50/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-nov08-push

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

into mysql.com:/home/psergey/mysql-5.0-nov08-push

into mysql.com:/home/psergey/mysql-5.0-oct08-push


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


sql/field.cc:
  Auto merged

mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-4.1-nov08-push