Backported from 5.0.3.


innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate records we take X-lock
  for duplicate records.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
  take X-lock in this case for duplicate records.

into mysql.com:/home/psergey/mysql-4.1-bug9439

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


support-files/MacOSX/Makefile.am:
  Auto merged

  already (and that's the Makefile that acutally creates it)

into mysql.com:/home/psergey/mysql-4.1-look-range

minimum of lower bounds of two joined intervals.


mysql-test/r/range.result:
  Testcase for BUG#9348
mysql-test/t/range.test:
  Testcase for BUG#9348

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 mysql.com:/home/mydev/mysql-4.1-bug9188

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

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

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

Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.


myisam/myisampack.c:
  Bug#9487 - myisampack segmentation violation and bus error
  Added or changed proper casts for the argument of flush_buffer().
  Added a check for the counterstrike of the trick to have
  file_buffer.end some bytes below the real end of the buffer.

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

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

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