mysql-test/mysql-test-run.pl:
  Don't require restart if master is not started when running with --extern

mysql-test/lib/mtr_cases.pl:
  Don't look at lines that start with # ie. a comment
mysql-test/mysql-test-run.pl:
  Set env BIG_TEST if --big-test passed

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


mysql-test/mysql-test-run.pl:
  Manual merge of fix for location of mysql_client_test

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

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

	with embedded spaces
  
Problem:  Original code written assuming password contains no spaces.
Further, because of how sh interprets characters in variables, you
cannot do the "simple solution".
  
Solution:  Move the "was a password provided" check to the end. This
allows us to correctly quote the password argument when passed to the
mysql client program.  Addendum:  Put this check inside of a shell fn
to simplify the code.


scripts/mysql_fix_privilege_tables.sh:
  Moved password existence check to end to allow for passwords with
  with embedded spaces.

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

mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Remove build of mysql_test_run_new
  Symlink mysql-test-run.pl to mysql-test-run
  Rename mysql-test-run.sh to mysql-test-run-shell.sh

use MTR_MEM environment variable

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

Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.


sql/mysqld.cc:
  On a crash when --memlock was active, emit advice about the insta-
  bility of that parameter.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


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

Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 


mysql-test/mysql-test-run.pl:
  Defined global variable.

Improve log message

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


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

As get_arg0_date() in the Item_func_last_day::get_date() returns 
0000-00-00 date sometimes, we have to check ltime->month for 0 after the call.


mysql-test/r/func_time.result:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test result.
mysql-test/t/func_time.test:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - test case.
sql/item_timefunc.cc:
  Fix for bug #23653: Crash if last_day('0000-00-00')
    - return error if month is 0.

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

Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()


innobase/fil/fil0fil.c:
  Applied innodb-4.1-ss33
  
  Revision r33:
  innodb-4.1: Merge r1002 from innodb/trunk:
  
  fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an
  array while holding the mutex.  This removes the crash-triggering
  race condition that was introduced when fixing Bug 15653.  (Bug #24089)

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41

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

mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description

Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 


client/mysqltest.c:
  Add new option --character-sets-dir to mysqltest
  Set MYSQL_SET_CHRSET_DIR before connecting to mysqld if the above variable is set
mysql-test/mysql-test-run.pl:
  Pass $path_charsetsdir to mysqltest

mysql-test/r/type_float.result:
  Fixed the testcase
strings/strtod.c:
  Removed the underflow check

into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged

  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.

 - Readd --skip-bdb when valgrinding


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

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  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint