Added a test case for bug #6866.
sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.

  Identation correction for the fix of bug #9939.

into igor-inspiron.creware.com:/home/igor/mysql-5.0

into igor-inspiron.creware.com:/home/igor/mysql-5.0

  Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure

into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0

  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.

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

  Integer overflow results in wrong field sortlength.

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

set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.

into mysql.com:/home/mydev/mysql-5.0-5000

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

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

into zim.(none):/home/brian/mysql/mysql-5.0

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

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

  Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION

Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.

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

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

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

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

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

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

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

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