Mofidications to dump secondary and tertiary weigthts
  And some minor improvements


strings/uca-dump.c:
  Mofidications to dump secondary and tertiary weigthts
  And some minor improvements

- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well. 

  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
lock0lock.c:
  Let SHOW INNODB STATUS print the history list length


innobase/lock/lock0lock.c:
  Let SHOW INNODB STATUS print the history list length
innobase/trx/trx0purge.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
innobase/trx/trx0undo.c:
  Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004

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

 of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.


mysql-test/r/ps.result:
  Test case for Bug#6297: test results fixed.
mysql-test/t/ps.test:
  A test case for Bug#6297 "prepared statement, wrong handling of 
  <parameter> IS NULL"
sql/item.h:
  A fix for Bug#6297: we must not only set null_value in Item_param, but
  also implement Item_param::is_null() to work well with  IS NULL/
  IS NOT NULL.
  Item::is_null() commented.

  Tweak some help text.


client/mysql.cc:
  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


client/mysqladmin.cc:
  reverting linking ndbclisnt to mysqladmin.cc
client/Makefile.am:
  reverting linking ndbclisnt to mysqladmin.cc

  reverting my last fix


acinclude.m4:
  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


ndb/src/kernel/vm/Configuration.cpp:
  corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  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

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


mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
sql/item_timefunc.cc:
  Manual merge

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

ndb/src/kernel/blocks/ERROR_codes.txt:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  do not crash on config mismatch if release compiled
ndb/test/ndbapi/testDict.cpp:
  do not crash on config mismatch if release compiled

  This test was moved into func_group.


mysql-test/r/func_str.result:
  This test was moved into func_group.

properly" with main tree.


libmysql/libmysql.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


mysql-test/r/func_group.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/r/func_str.result:
  Bug #6658 MAX(column) returns incorrect coercibility
mysql-test/t/func_group.test:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_func.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.cc:
  Bug #6658 MAX(column) returns incorrect coercibility
sql/item_sum.h:
  Bug #6658 MAX(column) returns incorrect coercibility

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.

strings/ctype-mb.c:
  Incorrect response with partial utf8 index:
  Fill the max string with max_sort_char up to res_length bytes.
strings/ctype-uca.c:
  Incorrect response with partial utf8 index.
  Typo fixes for UTF8 collations.

BitKeeper/etc/ignore:
  added ../ndb/tools/ndb_restore

  merge error


sql/ha_ndbcluster.cc:
  merge error

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

  new file

  post-conflict-merge fix (duplicate comment)


sql/log_event.cc:
  post-conflict-merge fix (duplicate comment)

sql/log_event.cc:
  SCCS merged

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.

sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged