- Importing the bug fixes by patch due to merge problems.

into neptunus.(none):/home/msvensson/mysql/bug10589

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
mtr_misc.pl:
  Utility function that search aand check path names
mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite

into  mysql.com:/home/jimw/my/mysql-4.1-clean

  Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into rurik.mysql.com:/home/igor/mysql-4.1

  Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.

commit. (Bug #10840)

  Corrected dependency for "lex_hash.h", to avoid occasional make failure

  Added CR for readability

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into igor-inspiron.creware.com:/home/igor/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-bg11060

INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.

into neptunus.(none):/home/msvensson/mysql/bug10365

  Use the Perl version of mysql-test-run

  Corrected path to 'mysql_fix_privilege_tables'

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1

  remove typecheck in ndb handler not needed

  Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

which the query contained more words than we allocated space. (Bug #7858)

 - Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
 - Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
 - Add test func_encrypt_nossl that is tun when the server is missing support for openssl. 

into rurik.mysql.com:/home/igor/mysql-4.1