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

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


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

 - Better control of when to create/remove vardir


mysql-test/mysql-test-run.pl:
  Split the part the function cleanup_stale_files in two parts
    - one that removes any old var directories
    - one that setup var in te proper location
  
  If running against extern server and no vardir has been created in the specified
  location, run the latter function to create the vardir structure. Else print
  message saying the vardir already exists and continue.

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


sql/mysql_priv.h:
  Auto merged

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


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged

And if var/ has been created, it will be recreated later so the logs
from "mtr_kill_leftovers" will be lost anyway  


mysql-test/mysql-test-run.pl:
  Don't create vardir before mtr_kill_leftovers
mysql-test/lib/mtr_process.pl:
  Send output - if any - from mysqladmin to stdout/stderr. There shouldn't
  be any such errors and if any occur, it's good to know about them.

mysql-test/lib/mtr_report.pl:
  Don't output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".

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


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

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.h:
  Auto merged
mysql-test/r/mysql.result:
  Manual merge
mysql-test/t/mysql.test:
  Manual merge

master_port after a "change master" will be set to the compiled in default value
i.e not always the same as what the master report as it's port number. 


mysql-test/mysql-test-run.pl:
  Read the master-port value from the mysqld. Used for replacing the 
  default compiled in port number in for example rpl000015
mysql-test/r/rpl000015.result:
  Update result file
mysql-test/t/rpl000015.test:
  When changing master without specifying master port, the port for master will
  be set to the compiled in default. Replace with that value

Problems (appear only under some circumstances): 
  1. we get a reference to a deleted table searching in the 
     thd->handler_tables_hash in the mysql_ha_read().

  2. DBUG_ASSERT(table->file->inited == handler::NONE); assert fails in the
     close_thread_table().

Fix: end open index scans and table scans and remove references to the 
tables from the handler tables hash. After this preparation it is safe 
to close the tables. The close can no longer fail on open index/table 
scans and the closed table will not be used again by handler functions.
                                 


sql/mysql_priv.h:
  Fix for bug #21587: FLUSH TABLES causes server crash when used with HANDLER statements
    - mysql_ha_mark_tables_for_reopen() introduced.
sql/sql_base.cc:
  Fix for bug #21587: FLUSH TABLES causes server crash when used with HANDLER statements
    - call mysql_ha_mark_tables_for_reopen() to prepare for the following close.
sql/sql_handler.cc:
  Fix for bug #21587: FLUSH TABLES causes server crash when used with HANDLER statements
    - mysql_ha_mark_tables_for_reopen() function introduced.

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


sql/sql_parse.cc:
  Auto merged

into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca


mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  ymer.(none):/usr/local/mysql/tmp/mysql-5.0-gca


mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

traces in Valgrind (broken libc6-dbg).
Installing libc6-dbg on Debian will still provide proper bactraces, even
without setting LD_LIBRARY_PATH explicitly.


mysql-test/lib/mtr_io.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.
mysql-test/mysql-test-run.pl:
  Do not link /usr/lib/debug/* on Debian <=3.1, as it causes broken stack
  traces in Valgrind.

since that is where  the lang files etc are

Remove other warnings about unused variables

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


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

And it's not an "opt"

 - Put 'my_getpagesize' in it's own .c file
 - Map the call 'my_getpagesize' directly to 'getpagesize' if it exists
 - Add default implementation for 'my_getpagesize' to be used if no platform
   specfic function exists


include/my_sys.h:
  Break out the defines for my_getpagesize from HAVE_SYS_MMAN_H as they don't depend on that.
  There is a check for the function in configure which defines HAVE_GETPAGESIZE if the function
  exists
mysys/CMakeLists.txt:
  Add new fil my_getpagesize.c
mysys/Makefile.am:
  Add new fil my_getpagesize.c
mysys/my_mmap.c:
  Remove my_getpagesize from my_mmap.c as it's now implemented in my_getpagesize.c
mysys/my_getpagesize.c:
  New BitKeeper file ``mysys/my_getpagesize.c''

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


client/mysql_upgrade.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge

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

sql-common/my_time.c:
  Function declaration must be same as definition

into  mysql.com:/usr/home/ram/work/bug21789/my41-bug21789


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

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


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  Auto merged

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


mysql-test/r/date_formats.result:
  Auto merged
sql-common/my_time.c:
  merging

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

into  mysql.com:/usr/home/ram/work/bug22029/my41-bug22029


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

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


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

- Use more appropriate test case.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Result.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Alt. Test

- Post Merge Fix.


mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Post merge fix.

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


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  merging

- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.


client/readline.cc:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - When removing the '\n' character, check for and remove preceeding '\r' 
  character as well.
mysql-test/r/mysql.result:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Results.
mysql-test/t/mysql_delimiter.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - Added Tests.
mysql-test/t/mysql_delimiter_19799.sql:
  Bug#19799 delimiter command not working correctly when sourcing a sql file
  - File containing delimiter statement followed by '\r\n' line ending.

scripts/mysql_fix_privilege_tables.sql:
  Remove annoying single '

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


client/mysqltest.c:
  Auto merged