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


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

 - Readd --skip-bdb when valgrinding


mysql-test/mysql-test-run.pl:
  Readd --skip-bdb when valgrinding

 - Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
   test case where the server is currently not supposed to be able to read the specific cert/key file.
 - Change error message to be generic as it's called both from server and client code.


vio/viosslfactories.c:
  Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. 
  Change error message to be generic as it's called both from server and client code.

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


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

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


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

Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start 

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

Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory>  


include/abi_check.ic:
  Ignore file
include/abi_check:
  Ignore file

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

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


mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug19736/my50-bug19736

mysql-test/r/func_test.result:
  Merge fix. (Curse BitMover!)

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
mysql-test/r/func_test.result:
  Manual merge.
mysql-test/t/func_test.test:
  Manual merge.
sql/item_func.cc:
  Manual merge.

  
The Item_func_mod objects never had maybe_null set, so users had no reason 
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.


mysql-test/r/func_test.result:
  Verify that the predictions are true.
mysql-test/t/func_test.test:
  Verify that the predictions are true.
sql/item_func.cc:
  MOD functions may be NULL.

include/Makefile.am:
  Remove abi_check from BUILT_SOURCES it's in the "all" rule
  Make abi_check depend on mysql_h.ic as well

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

mysql-test/lib/mtr_stress.pl:
  "stop_masters" function renamed to "stop_all_servers"
  "path_mysock" renamed to "path_sock"

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


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
myisam/sort.c:
  Manual merge(double checked)
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysys/mf_iocache.c:
  Manual merge

mysql-test/r/mysql.result:
  Update test result after commenting out the test
mysql-test/t/mysql.test:
  Rewrite the test commands so they don't depend on "echo" behaviour
  Comment out one as it's a duplicate

client/mysqltest.c:
  The expanded command executed by mysqltest is in ds_cmd

into  neptunus.(none):/home/msvensson/mysql/my50-m-stress

Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.

into  neptunus.(none):/home/msvensson/mysql/my50-m-stress

mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"

When we write 'query=...' string to a frm file for views on a slave, 
indentifiers are not properly quoted due to missing OPTION_QUOTE_SHOW_CREATE 
flag in the thd->options.

Fix: properly set thd->options for the slave thread.


mysql-test/r/rpl_view.result:
  Fix for bug #19736 VIEW: column names not quoted properly when view is replicated
    - result adjusted.
sql/slave.cc:
  Fix for bug #19736 VIEW: column names not quoted properly when view is replicated
    - properly set thd->options only in one place (in the set_slave_thread_options()),
      using thd_startup_options. As a side effect we have OPTION_BIG_SELECTS flag set
      after the set_slave_thread_options() call from the 
      log_enevt.cc:Rotate_log_event::exec_event().

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

  Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23