Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)


mysql-test/r/show_check.result:
  Testcase for BUG#9439
mysql-test/t/show_check.test:
  Testcase for BUG#9439
sql/sql_show.cc:
  Fix for BUG#9439:
  Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)

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

Don't abort on bootstrap if a wrong --default-storage-engine is specified


sql/handler.cc:
  Combined code
sql/mysqld.cc:
  Fixed core dump with long timezone names
  Don't abort on bootstrap if a wrong --default-storage-engine is specified
  Don't print strange messages if one sends 'kill' to a mysqld --bootstrap
sql/set_var.cc:
  Indentaion change

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

sql/sql_lex.cc:
  ul

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


sql/mysqld.cc:
  Auto merged

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

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

don't set lex->lock_option=TL_READ in the parser for SELECT

for LSB init functions when they aren't available. (Bug #9852)


support-files/mysql.server.sh:
  Use shell function instead of less portable alias command
  to create replacements for LSB functions, and also use
  argument in our replacements.

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

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

mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged

  Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped


innobase/fil/fil0fil.c:
  Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped

bug#8151

into mysql.com:/space/my/mysql-4.0

into mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/export/space/pekka/ndb/version/my41

into mysql.com:/usr/home/ram/work/mysql-4.1


client/mysqltest.c:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean

into mysql.com:/space/my/mysql-4.1-build

set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.

into mysql.com:/export/space/pekka/ndb/version/my41

refuse to start up if it is not. (Bug #9815)


sql/handler.cc:
  Add ha_storage_engine_is_enabled function.
sql/handler.h:
  Declare ha_storage_engine_is_enabled()
sql/mysqld.cc:
  Abort startup if the specified default storage engine is
  not available.

specified via --user or in configuration. (Bug #9833)


sql/mysqld.cc:
  Actually die if we an invalid user is specified.

mysys/default.c:
  cleanup + check for the last line in the file in "!include" directive processing

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-4.1-build


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

- fixed a date for a changelog entry  in the RPM spec file (s/Mar/Apr/) - RPM complains about wrongly
  ordered entries.


support-files/mysql.spec.sh:
  - fixed a date for a changelog entry (s/Mar/Apr/) - RPM complains about wrongly ordered entries.

  Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE


sql/ha_innodb.cc:
  Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE

BitKeeper/deleted/.del-Do-solaris-pkg~43f194aa28e68532:
  Delete: Build-tools/Do-solaris-pkg
BitKeeper/deleted/.del-Do-hpux-depot~d69e0b7c7f19d3:
  Delete: Build-tools/Do-hpux-depot

into mysql.com:/space/my/mysql-4.1-build


BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a:
  Auto merged
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
  Auto merged
BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8:
  Auto merged
BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec:
  Auto merged
BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03:
  Auto merged

BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a:
  Delete: Build-tools/Bootstrap
BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8:
  Delete: Build-tools/Do-pkg
BitKeeper/deleted/.del-logger.pm~9234101b5b668373:
  Delete: Build-tools/logger.pm
BitKeeper/deleted/.del-Do-rpm~c0ef3ebafbf53117:
  Delete: Build-tools/Do-rpm
BitKeeper/deleted/.del-cvs-sanity-check~a3c58acf37f27cee:
  Delete: Build-tools/cvs-sanity-check
BitKeeper/deleted/.del-Do-all-build-steps~bb7d38f34728ac06:
  Delete: Build-tools/Do-all-build-steps
BitKeeper/deleted/.del-Do-local-patch-file~b86e1bfa3b7c13d3:
  Delete: Build-tools/Do-local-patch-file
BitKeeper/deleted/.del-Do-linux-build~b3b941454648a285:
  Delete: Build-tools/Do-linux-build
BitKeeper/deleted/.del-Do-patch-file~a2e87df5f75fd496:
  Delete: Build-tools/Do-patch-file
BitKeeper/deleted/.del-newest~2dd91db13f2ea308:
  Delete: Build-tools/newest
BitKeeper/deleted/.del-Do-create-perl-rpms~1f946e7d8560b3d0:
  Delete: Build-tools/Do-create-perl-rpms
BitKeeper/deleted/.del-Do-win-build~cb5c5e1df8b3de6:
  Delete: Build-tools/Do-win-build
BitKeeper/deleted/.del-my_md5sum~4680250631e4fd9:
  Delete: Build-tools/my_md5sum
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
  Delete: Build-tools/Do-compile
BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03:
  Delete: Build-tools/mysql-copyright
BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec:
  Delete: Build-tools/mysql-copyright-2

- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly

The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.


scripts/Makefile.am:
  - removed fill_help_tables.sh and the creation of fill_help_tables.sql from the Makefile
    (fill_help_tables.sql is now generated on the documentation server and will be added to
    the offical source distribution during the Bootstrap
support-files/mysql.spec.sh:
  - fixed a typo