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

function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.

  fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.

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

into xiphis.org:/var/db/bk/work-acurtis/bug6776.1

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

into mysql.com:/M41/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

  test case for case 9749, ndb lock upgrade via NDBAPI

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

if there are foreign key constraints on the table. (Bug #5574)

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

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

between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)

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

  Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

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

  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

return error. We'll use it for better warnign reporting.

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

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

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