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-4.1-4100

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-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 mysql.com:/home/mydev/mysql-4.1-4100

Fixed two deadlocks.
Made minor changes.

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)

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

After merge fix.

into xiphis.org:/usr/home/antony/work2/p4-bug10413.2

Hand merged from 4.0.

  Stop ignoring name parts and check for validity

1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.

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

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

  Post-review modifications for the fix of bug #7894.

  Added test cases for bug #7894.
sql_select.cc:
  Fixed bug #7894: GROUP BY queries with ROLLUP returned
  wrong results for expressions containing group by columns.
  The fix ensured correct results by replacement of all
  occurrences of group by fields in non-aggregate expressions
  for corresponding ref objects and preventing creation of
  fields in temporary tables for expression containing group
  by fields.

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

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

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

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

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into mysql.com:/M40/mysql-4.0