into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged

  Corrected search for 'mysqlimport' executable


mysql-test/mysql-test-run.pl:
  Corrected search for 'mysqlimport' executable

support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".

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.

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

(Currently, affects only BSD with Linuxthreads)

into mysql.com:/M50/mysql-5.0

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

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


sql/field.cc:
  Auto merged

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

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


sql/examples/ha_tina.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

into mysql.com:/M50/mysql-5.0

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

Replace the full socket path name, not just a directory component. bug#14720


mysql-test/r/connect.result:
  In cases where "--tmpdir=" is given to the test run, the socket file is not created below
  "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not 
  be done to a directory in the path but rather to the complete path name of the socket file. 
  bug#14720
mysql-test/t/connect.test:
  In cases where "--tmpdir=" is given to the test run, the socket file is not created below
  "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not
  be done to a directory in the path but rather to the complete path name of the socket file.
  bug#14720

Initialized 'ptr' for a newly instantiated varstring field.
This is required by INSERT DELAYED.

No test case. This is a migration issue. There are two shell
scripts attached to the bug report. They can be used for testing.


sql/field.cc:
  Bug#13707 - Server crash with INSERT DELAYED on MyISAM table
  Initialized 'ptr' for a newly instantiated varstring field.
  This is required by INSERT DELAYED.

test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).


BUILD/compile-pentium64-valgrind-max:
  putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.
mysql-test/r/read_only.result:
  result update
sql/field.cc:
  To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).

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

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


mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.

mysql-test/r/csv.result:
  correct result file
mysql-test/t/csv.test:
  Add test for a bug
sql/examples/ha_tina.cc:
  Add O_APPEND flag to my_open. We should always add rows to the end of file

mysql-test/r/csv.result:
  update result file
mysql-test/t/csv.test:
  Add test for a bug
sql/examples/ha_tina.cc:
  sort function should return reverted values for chains to be sorted in
  the right orded. don't do a strange memmove

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


sql/mysql_priv.h:
  Auto merged

  Always use bundled zlib


support-files/mysql.spec.sh:
  Always use bundled zlib

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


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/my/mysql-5.0

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


sql/spatial.h:
  Auto merged

into  mysql.com:/my/mysql-5.0

(Main reason for reordering was to get rid of compiler warnings for order of element initialization)


sql/log.cc:
  Remove compiler warning
sql/sql_class.h:
  Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
  (Main reason for reordering was to get rid of compiler warnings for order of element initialization)

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

  SCCS merged


sql/sql_parse.cc:
  SCCS merged

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

into  mysql.com:/my/mysql-5.0

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


sql/mysqld.cc:
  Auto merged

(Caused sp-security to fail)

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