extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/COPYING:
  Import patch yassl.diff

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

into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint

 - Disable Instance manager on Windows


mysql-test/mysql-test-run.pl:
  Disable Instance manager on Windows.

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint

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


client/mysqltest.c:
  Auto merged

 - Use strmake, that will both protect the buffer and make sure it's terminated by a zero
 - Add test case


client/mysql.cc:
  Use strmake instead of strxnmov as that function will make sure the string is terminated by 0
mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test case

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

Move that perror test to ndb_basic so it's only run when there is support for --ndb


mysql-test/r/ndb_basic.result:
  Move test of "perror --ndb" to this file
mysql-test/r/perror.result:
  Move test of "perror --ndb" to ndb_basic
mysql-test/t/ndb_basic.test:
  Move test of "perror --ndb" to this file
mysql-test/t/perror.test:
  Move test of "perror --ndb" to ndb_basic

By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
Add an else bracnh that does the initialization.


sql/mysqld.cc:
  Intialize the "lowercase_filesystem" variable also when "lowercase_table_names" is 1

into  shellback.(none):/home/msvensson/mysql/bug21217/my50-bug21217


client/mysqltest.c:
  Manual merge 4.1->5.0

 - Init start_lineno to 0


client/mysqltest.c:
  Init start_lineno to 0 and set it back to zero before comparing result file.

difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.


mysql-test/r/func_time.result:
  Additional test results
mysql-test/t/func_time.test:
  Additional tests
sql/item_timefunc.cc:
  Fix for timestamp diff issue.  Added microsecond precision when
  comparing months or quarters; previously only examined date for
  these comparisons.

into  rama.(none):/home/jimw/my/mysql-5.0-19498

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

 - Use strxnmov to protect the "buff" variable from overrun


client/mysql.cc:
  Use strxnmov to protect the "buff" variable from overrun

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

mysql-test/r/perror.result:
  Add error result for 1186
  Remove the result for the others
mysql-test/t/perror.test:
  As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null

 - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.


extra/perror.c:
  Move the !found out one level
mysql-test/t/perror.test:
  Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
  Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code

 - Allow "query" to be used as a prefix for focing a command to be sent to server
 - Add testcases


client/mysqltest.c:
  To force something being sent as a query to the mysqld one can
  use the prefix "query". Remove "query" from string before executing.
mysql-test/r/mysqltest.result:
  Add test case for "query" command
mysql-test/t/mysqltest.test:
  Add test case for "query" command

 - Add test case


mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test for mysql using DESC command

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

  - Add test case(execute perror)
  - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
  - Thanks to Steven Xie for pointing out how to fix. 


extra/perror.c:
  strerror might return NULL on Solaris 2.8
mysql-test/mysql-test-run.pl:
  Add possibility to execute perror from test case
mysql-test/r/have_perror.require:
  New BitKeeper file ``mysql-test/r/have_perror.require''
mysql-test/r/perror.result:
  New BitKeeper file ``mysql-test/r/perror.result''
mysql-test/t/perror.test:
  New BitKeeper file ``mysql-test/t/perror.test''

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

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

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

 - Add printout in write_footer to tell that mysqldump has completed.
   Ex: -- Dump completed 2006-07-24  8:55:05


client/Makefile.am:
  Build mysqldump with mf_getdate.c
client/mysqldump.c:
  Add printout in write_footer that will print info that mysqldump has completed

into  mysql.com:/usr/home/ram/work/5.0.b19370

into  mysql.com:/usr/home/ram/work/5.0.b19370

into  mysql.com:/usr/home/ram/work/5.0.b8143

mysql-test/r/delete.result:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test result
mysql-test/t/delete.test:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test case
sql/sql_delete.cc:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - during SELECT queries processing we convert 'date[time]_field is null' 
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null 
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.
      Also it may simplify and speed up DELETE queries execution.

into  mysql.com:/usr/home/ram/work/5.0.b19370


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

into  mysql.com:/usr/home/ram/work/5.0.b10966


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

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

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

 - "set @@character_set_database" should be ignored by servers prior to 4.1.1


client/mysqlimport.c:
  Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517

into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517


configure.in:
  Auto merged