into mysql.com:/M50/mysql-5.0

into hundin.mysql.fi:/home/jan/orig/mysql-5.0

into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug9496

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

  Correction after fix for bug #9902.


mysql-test/r/view.result:
  Correction after fix for bug #9902.

by Philip Antoniades


scripts/mysql_fix_privilege_tables.sql:
  Update for VARCHAR and remove 4.1-specific actions.
    by Philip Antoniades

into mysql.com:/home/dlenev/src/mysql-5.0-merges

into mysql.com:/home/dlenev/src/mysql-5.0-merges

  Style fix


sql/ha_innodb.cc:
  Style fix

negative argument gives wrong result" into 5.0 tree.

argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.


mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/r/func_sapdb.result:
  Manual merge.
sql/item_timefunc.cc:
  Manual merge.

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

into mysql.com:/home/pem/work/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

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:/M50/mysql-5.0

scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.server.sh:
  Auto merged

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

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

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

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

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)

sql/opt_range.cc:
  Auto merged

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

scripts/make_binary_distribution.sh:
  add libexec expansion handling to make_binary_distribution
support-files/mysql.server.sh:
  mysql.server init.d script fixed back to use mysqld_safe by default, as mysqlmanager does not handle all
  installation scenarious yet. + libexecdir template was added for mysqlmanager to deal nicely  with the
  source distribution

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-5.0-bug9188


myisam/myisampack.c:
  Auto merged

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

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

myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

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

into mishka.local:/home/my/mysql-5.0

Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)


support-files/mysql.server.sh:
  Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
  Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
  Search first for defaults files in basedir and then in datadir (like mysqld_safe)
  I removed the test for localstatedir as default.c doesn't anymore read defaults files from localstatedir