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

into  polly.local:/tmp/maint/bug24037/my50-bug24037


strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged

Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:

LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)


sql/share/charsets/hebrew.xml:
  Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:
  
  LEFT-TO-RIGHT MARK (LRM)
  RIGHT-TO-LEFT MARK (RLM)
strings/conf_to_src.c:
  Added a warning comment in the generated C source file.
strings/ctype-extra.c:
  Re-generated from sql/share/charsets/hebrew.xml
mysql-test/r/ctype_hebrew.result:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
mysql-test/t/ctype_hebrew.test:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"

mysql-test/t/rpl_openssl.test:
  Exclude

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


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

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

 - Skip tests using chmod when running as root


mysql-test/t/information_schema_chmod.test:
  Use mysqltest builtin "chmode"
mysql-test/t/mysqltest.test:
  Dont run as root - test chmod
mysql-test/t/rpl_rotate_logs.test:
  Use mysqltest builtin "chmode"
  Use 'write_file' and 'chmod' instead of system
mysql-test/t/trigger.test:
  Don't run as root
  Use 'write_file' and 'chmod'
mysql-test/t/varbinary.test:
  Don't run as root

 - Don't call SSL_shutdown a second time


vio/viossl.c:
  SSL_shutdown might return 0 indicating that it should be called once
  again for a graceful shutdown. Since the socket are going to be closed
  anyway ther is no need for the second call.

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


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

many as neeeded

mysqld and valgrind to tracefile.

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

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


include/mysql_h.ic:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

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

into  shellback.:C:/mysql/mysql-5.0-maint

include/my_pthread.h:
  Calculate absolute time value int set_timespec_*
mysys/my_wincond.c:
  Use absolute timevalue in pthread_cond_timedwwait

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysys/default.c:
  Section of code from 4.1 doesn't exist anymore.

bug #25104


mysys/default.c:
  Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
  Added /etc/mysql to the my.cnf search path.
  Changed chop to chomp - since it's smarter.

bug #25104


mysys/default.c:
  Added support for /etc/mysql after /etc in the search path for my.cnf

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/myisam.result:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

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

 - Remove check not to run on windows. 


mysql-test/t/rpl_openssl.test:
  Remove check not to run on windows

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysql-test/r/myisam.result:
  SCCS merged

- Result file was not properly committed.
- Update result file to match the new test case.


mysql-test/r/myisam.result:
  Bug#17498 failed to put data file in custom directory use "data directory" option
  
  - Update result file to match the new test case.

into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/r/myisam.result:
  Manual merge.
mysql-test/r/symlink.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
mysql-test/t/symlink.test:
  Manual merge.

mysql-test/r/myisam.result:
  Fix results file - a test was moved from the .test file, but the results were not updated.
mysql-test/r/symlink.result:
  echo End of 4.1 tests while I'm here
mysql-test/t/myisam.test:
  echo End of 4.1 tests while I'm here
mysql-test/t/symlink.test:
  echo End of 4.1 tests while I'm here

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