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

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0

fixed bug: "create view v7 as select * from information_schema.tables;" failed

  Tweak some help text.

into mysql.com:/home/dlenev/src/mysql-4.1-bg6266

into mysql.com:/home/dlenev/src/mysql-4.1-bg6439

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

  reverting linking ndbclisnt to mysqladmin.cc

  reverting my last fix

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

    fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
    and simplified code a bit

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

wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.

  This test was moved into func_group.

properly" with main tree.

Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.

into mysql.com:/home/dlenev/src/mysql-4.0-bg6439

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into mysql.com:/space/pekka/ndb/version/my41

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into mysql.com:/space/pekka/ndb/version/my41

the same queries.

  merge error

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  new file

  post-conflict-merge fix (duplicate comment)

When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.