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

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

fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words

into mysql.com:/home/kostja/mysql/mysql-4.0-1724

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

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

rli->save_temporary_tables and slave_open_temp_tables
(in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
indefinitely by doing RESET SLAVE and replicating always the same CREATE
TEMPORARY TABLE).
It's critical to reset save_temporary_tables to 0 (otherwise you may later
read memory which has been freed) so this changeset should go into 4.1.

  Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation

has changed since 4.0.14'
We need to calculate cost of RANGE
scan if it is present instead of cost of 
FULL scan.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1279

changes after montys review

Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.

  all calls of fix_fields() are inspected
(copy of cset which I lost in accidatly tree delete)

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

dependence should mean uncacheability

into mysql.com:/my/mysql-4.0

Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.

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

dded init of variable to fix core dump on startup errors

tests with innodb moved to separate file

(found during BUG#1708 investigation)

(test suite will be with next part)

- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.