New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.

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

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

(BUG#1839)

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

  a bug in latin1_german2 FT fixed

print() method code covarage for some string function which I lost last time

code covarage for srid, GeomFromText with 2 parameters
code covarage foe print() method of gis functions

  Do renames based on space id in log replay of ibbackup

no need to sync'em here

into mysql.com:/home/kostja/mysql/mysql-4.1-root

into mysql.com:/home/walrus/bk/41

  Stop line wrapping for compiler warnings.
  It needs for warnings statistic in code coverage

==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8115FD2: Item_func_uncompressed_length::val_int() (sql_string.h:90)
==2761==    by 0x8105658: Arg_comparator::compare_int() (item_cmpfunc.cc:356)
and
==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8116101: Item_func_compress::val_str(String*) (sql_string.h:90)
==2761==    by 0x80E9193: Item::save_in_field(Field*, bool) (item.cc:1155)

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

==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x81913BB: find_best(JOIN*, unsigned long long, unsigned, double, double) (sql_select.cc:2689)
==2761==    by 0x8191030: find_best_combination(JOIN*, unsigned long long) (sql_select.cc:2599)

==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x818F580: make_join_statistics(JOIN*, st_table_list*, Item*, st_dynamic_array*) (sql_select.cc:1850)
==2761==    by 0x818B705: JOIN::optimize() (sql_select.cc:578)

as an error message (which is harmless, but confusing when you
compare the output from comp_err for different language files).

  Marko's patch to ut_a() fputs

into deer.(none):/home/ram/work/4.1

new comments.

into narttu.mysql.fi:/my/mysql-4.1

After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed

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