mysql-test/r/func_crypt.result:
  Add new results
mysql-test/t/func_crypt.test:
  Add new regression test
sql/item_strfunc.cc:
  Handle NULL result from call to crypt().

  Replaced --machine with --platform
  General code cleanup


scripts/make_binary_distribution.sh:
  Replaced --machine with --platform
  General code cleanup

into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605

  Wrong variable.


sql/item_cmpfunc.cc:
  Wrong variable.

BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Delete: mysql-test/ndb/ndb_range_bounds.pl

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

BUILD/SETUP.sh:
  Remov -ansi flag

  wrong variable.


sql/item_cmpfunc.cc:
  wrong variable.

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

into  hundin.mysql.fi:/home/marko/mysql-4.1

into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)


sql/ha_innodb.cc:
  Merged

in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)


sql/ha_innodb.cc:
  ha_innobase::get_foreign_key_create_info(): Display an error
  message to the user if a temporary file cannot be created.

BUILD/SETUP.sh:
  ansi glags should only be set for C++ compilation

  Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005


innobase/os/os0sync.c:
  Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005

into  hundin.mysql.fi:/home/marko/mysql-4.1

sql/ha_innodb.cc:
  Avoid bitwise arithmetics, as it might be difficult to read.  The
  added readability costs one register and two instructions on x86.

  New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files

sql/ha_innodb.cc:
  innobase_convert_and_store_changed_col(), calc_row_difference():
   Replace parameter "is_unsigned" with "prtype".
  innobase_convert_and_store_changed_col():
   When trimming spaces, note that UCS2 spaces are 0x0020, not 0x20.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  Check returnvalue on load/fetch configuration


ndb/tools/ndb_config.cpp:
  Check returnvalue on load/fetch configuration

 add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)


mysql-test/r/ndb_config.result:
  Add support for reading config.ini from ndb_config
mysql-test/t/ndb_config.test:
  Add support for reading config.ini from ndb_config
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Handle prinouts better
ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Handle prinouts better
ndb/tools/ndb_config.cpp:
  Add support for reading config.ini from ndb_config

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

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

  Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line


mysql-test/t/mysqldump.test:
  Removed ending ';' from --exec line
mysql-test/mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysql-test/lib/mtr_report.pl:
  Text formatting, adjust table header

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/mydev/mysql-4.0-4000

support-files/mysql.spec.sh:
  Auto merged

   spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)


support-files/mysql.spec.sh:
   - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
     $RBR variable did not get expanded, thus leaving old build roots behind)

into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/t/merge.test:
  Auto merged
mysql-test/r/merge.result:
  SCCS merged

Second platform fix for floating point rounding.

  "CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.


mysql-test/r/sql_mode.result:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case
mysql-test/t/sql_mode.test:
  Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
    test case

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


sql/item_cmpfunc.cc:
  Auto merged

BUILD/SETUP.sh:
  Add -ansi flag, make gcc not allow "C++ comments in C"

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main