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

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

  ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x

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

typo in error message text corrected.
new tests added

(BUG#1537)

Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)

query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization

  Fix error in --show-slave-auth-info help string.

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.

a Format_description_log_event (or maybe it will be named
Description_log_event) which is not recognized by 4.0, so
a 4.0 can't be a slave of 5.0. We detect it early to produce
a helpful message instead of "corrupted relay log" later.