into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).

into mdk10.(none):/home/reggie/bk/mysql-5.0

into mdk10.(none):/home/reggie/bk/mysql-4.1

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

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

into mysql.com:/usr/home/bar/mysql-5.0

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

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

function" into 4.1 tree.

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.

Added email threading capabilities to both
programs.

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

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

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

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

into mdk10.(none):/home/reggie/bk/mysql-4.1

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

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

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

  and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied

Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server

into mdk10.(none):/home/reggie/bk/mysql-4.1

into mysql.com:/M41/mysql-4.1