into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

  Merge from 4.1

code, because a warning was given also.

into mysql.com:/space/pekka/ndb/version/my50

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

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

  Perl script to create HP depot packages.

  Manual post-merge

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

  Revised the fix for bug #7098.
  Corrected the method Item_string::new_item.
sql_select.cc:
  Revised the fix for bug #7098.
  Aborted the previous modifications.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.

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

  Make SQL more readable, substitute hostname at runtime
mysql-test-run.pl:
  Run init scripts with /bin/sh, ignore return code

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

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

'ps_1general' and 'fulltext_cache' test cases.

into mysql.com:/home/dellis/bkl/bug-4.1

  Fix ambigious table error for INSERT..SELECT..UPDATE

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

Recommited, as I made a typo in the previous patch myself =)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

into mysql.com:/home/dellis/bkl/bug-5.0

into mysql.com:/home/mysql_src/mysql-5.0-xa

into mysql.com:/home/mysql_src/mysql-5.0-xa

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