Made yaSSL support an option (off by default)


support-files/mysql.spec.sh:
  Made yaSSL support an option (off by default)

  Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min


mysql-test/mysql-test-run.pl:
  Increased test case timeout from 15 min
support-files/mysql.spec.sh:
  Enabled yaSSL

The lack of this --replace resulted in the test failing on all build hosts


mysql-test/r/im_life_cycle.result:
  fix result
mysql-test/t/im_life_cycle.imtest:
  replace instance port number in result, as it could be set differently for different
  test runs.

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

bug 2030. Will push a proper fix later


server-tools/instance-manager/manager.cc:
  Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels.

  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
mtr_cases.pl:
  Added --skip-im option handling
mtr_process.pl:
  Kill left over 'mysqld' processes started by IM


mysql-test/lib/mtr_process.pl:
  Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
  Added --skip-im option handling
mysql-test/mysql-test-run.pl:
  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.

  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX

  Missing yaSSL added to pro-gpl target


VC++Files/mysql.sln:
  Missing yaSSL added to pro-gpl target

  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0


support-files/mysql.spec.sh:
  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0

  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree


support-files/mysql.spec.sh:
  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree

  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"


support-files/mysql.spec.sh:
  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"

instead of Field_longlong::store(double nr).

mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023

  - reverted NDB version number, too


configure.in:
  - reverted NDB version number, too

configure.in:
  - revert version number to 5.0.15

into mysql.com:/data0/mysqldev/my/mysql-5.0-release

into  mysql.com:/home/my/mysql-5.0

VC++Files/test1/mysql_thr.c:
  Fixed typo
VC++Files/thr_test/thr_test.c:
  Fixed typo
sql/log_event.cc:
  Removed compiler warning
  Fixed compile error on windows

  after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,

into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

Netware. Hartmut informed about this.

into  mysql.com:/usr/home/bar/mysql-5.0.char1

netware/mysql_test_run.c:
  Fixed typo.
netware/pack_isam.def:
  Added screenname.
scripts/make_binary_distribution.sh:
  Fixed mistake in merge.

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

into  mysql.com:/usr/home/bar/mysql-5.0.char1

ndb/src/mgmsrv/Services.cpp:
  Remove explicit instantiation to fix link failure on OS X

  Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1


VC++Files/mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
BitKeeper/deleted/.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
BitKeeper/deleted/.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
BitKeeper/deleted/.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
BitKeeper/deleted/.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
BitKeeper/deleted/.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
BitKeeper/deleted/.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
BitKeeper/deleted/.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
BitKeeper/deleted/.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
BitKeeper/deleted/.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
BitKeeper/deleted/.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
BitKeeper/deleted/.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
BitKeeper/deleted/.del-mysqlwatch.vcproj~91c7061bceb731ad:
  Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0

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

  New version 5.0.16


configure.in:
  New version 5.0.16

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0

  rc => GA


configure.in:
  rc => GA

into  mysql.com:/home/my/mysql-5.0

Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases

into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1