into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

http://bugs.mysql.com/bug.php?id=1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.

  Reduce InnoDB memory allocation if buffer pool < 8 MB

   patch)
  (BUG#1440: Redundant class name confusing hpux compiler)

removed unnesessary code from create.test

into mashka.mysql.fi:/home/my/mysql-4.1

Created small scripts to manage in-tree diffs for NetWare platform, so changes are visible in the tree but cannot affect other platforms

into mashka.mysql.fi:/home/my/mysql-4.1

After merge fixes

into mashka.mysql.fi:/home/my/mysql-4.0

Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)

into mashka.mysql.fi:/home/my/mysql-4.0

  Win compilation problem fix
ctype-bin.c:
  Win compilation problem fix
  ,
  ,
m_ctype.h:
  Win compilation problem fix
  ,

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max

into mysql.com:/usr/home/harry/mysqlstuff/mysql-4.1

  Visual C++ apparently does not know what -1LL (= -1 in longlong type) means

  Fix Visual C++ compilation errors reported by Miguel

existed, causing problems on non-case-sensitive OSes.
Deleted conflicting file.

  IMPORT TABLESPACE must reset lsns if they are too high
ha_innodb.cc:
  DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table

make LOCK TABLES to work when Lock_tables_priv is granted on the DB level and Select_priv is granted on the table level.

  Add DISCARD etc. in the keyword: rule of sql_yacc.yy
sql_table.cc:
  Add comment that DISCARD/IMPORT TABLESPACE is always the only clause in an ALTER TABLE

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