mysql-test/r/func_time.result:
  Test for WL#1253: LAST_DAY
mysql-test/t/func_time.test:
  Test for WL#1253: LAST_DAY

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


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

  a bug in latin1_german2 FT fixed


myisam/ft_nlq_search.c:
  a bug in latin1_german2 FT fixed
mysql-test/r/fulltext.result:
  a bug in latin1_german2 FT fixed
mysql-test/t/fulltext.test:
  a bug in latin1_german2 FT fixed

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


mysql-test/r/func_crypt.result:
  print() method code covarage
mysql-test/r/func_encrypt.result:
  print() method code covarage
mysql-test/r/func_str.result:
  sunstring_index() code covarage
  print() method code covarage
mysql-test/t/func_crypt.test:
  print() method code covarage
mysql-test/t/func_encrypt.test:
  print() method code covarage
mysql-test/t/func_str.test:
  sunstring_index() code covarage
  print() method code covarage

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


mysql-test/r/gis.result:
  code covarage for srid, GeomFromText with 2 parameters
  code covarage foe print() method of gis functions
mysql-test/t/gis.test:
  code covarage for srid, GeomFromText with 2 parameters
  code covarage foe print() method of gis functions
  + commented test for issimple() (bugreport sent)
sql/item_geofunc.h:
  fixed printability of gis functions

  Do renames based on space id in log replay of ibbackup


innobase/fil/fil0fil.c:
  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


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

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

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


BUILD/compile-pentium-gcov:
  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)


sql/item_strfunc.cc:
  ptr() is used instead of c_ptr(), because it is safe enough, more efficient and do not confuse valgrind

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)


sql/sql_select.cc:
  keypart_map fiels should be initialized in case of fulltext index

==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)


sql/sql_select.cc:
  optimize field should be initialized in case of fulltext index

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


sql/share/italian/errmsg.txt:
  Removed trailing blank line as it counts as an error message
  (which is harmless, but confusing when you compare the output
  from comp_err for different language files).
sql/share/korean/errmsg.txt:
  Removed trailing blank line as it counts as an error message
  (which is harmless, but confusing when you compare the output
  from comp_err for different language files).
sql/share/norwegian/errmsg.txt:
  Removed trailing blank line as it counts 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


innobase/ut/ut0dbg.c:
  Marko's patch to ut_a() fputs
innobase/include/ut0dbg.h:
  Marko's patch to ut_a() fputs

myisam/rt_split.c:
  Prevent memcpy if source and destination are same

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

new comments.


myisam/mi_open.c:
  fix for r-tree code (memory overlap reported by valgrind)
myisam/myisamdef.h:
  fix for r-tree code (memory overlap reported by valgrind)
myisam/rt_index.c:
  fix for r-tree code (memory overlap reported by valgrind)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BUILD/compile-pentium-valgrind-max:
  New attempt to avoid multiple warning
mysql-test/mysql-test-run.sh:
  --valgrind-all now automaticly enables valgrind

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


sql/sql_select.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

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


myisam/mi_rnext_same.c:
  handle case where rtree_find_next() returns an error
  (assume this means that there was no more keys)
myisam/rt_index.c:
  Code cleanup
mysql-test/r/func_crypt.result:
  Update results
mysql-test/r/func_group.result:
  Update results
mysql-test/r/null_key.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/query_cache.result:
  Update results
mysql-test/r/range.result:
  Update results
mysql-test/r/rpl_trunc_binlog.result:
  Update results
mysql-test/t/fulltext.test:
  Fix error numbers
mysql-test/t/func_crypt.test:
  Fixed test for 4.1
mysql-test/t/range.test:
  Moved tests to be in sync with 4.0
mysys/test_charset.c:
  Removed acccess to non existing functions
sql-common/client.c:
  Merge fix
sql/item_strfunc.cc:
  Simple code cleanup
  Don't call ->c_ptr() when you don't need a 0 terminated string
  (Causes warnings from valgrind)
sql/log_event.cc:
  After merge fixes
sql/protocol.cc:
  Change default catalog name to 'def'
sql/spatial.cc:
  Code cleanup
sql/sql_class.cc:
  After merge fixes
sql/time.cc:
  Ensure that time object is cleared on error
sql/unireg.cc:
  Removed warning reported by valgrind

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


sql/sql_select.cc:
  Auto merged

sql/sql_lex.h:
  removed unused flag
sql/sql_union.cc:
  correct flag used

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-apply-patch:
  Delete: netware/BUILD/apply-patch
BitKeeper/deleted/.del-save-patch:
  Delete: netware/BUILD/save-patch
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
extra/resolveip.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/errors.c:
  Auto merged
mysys/my_symlink.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/unireg.h:
  Auto merged
client/mysqldump.c:
  merge with 4.0 (quoted names)
configure.in:
  use local file
include/my_pthread.h:
  Use local file
innobase/include/srv0srv.h:
  Use local file
innobase/row/row0sel.c:
  Use local file
innobase/srv/srv0srv.c:
  Use local file
libmysql/libmysql.c:
  Use local file
myisam/myisamchk.c:
  merge fixes
mysql-test/r/func_crypt.result:
  update results
mysql-test/r/order_by.result:
  update results
mysql-test/r/query_cache.result:
  update results
mysql-test/r/range.result:
  update results
mysql-test/r/rpl_reset_slave.result:
  update results
mysql-test/r/rpl_trunc_binlog.result:
  update results
mysql-test/t/func_crypt.test:
  Added disable_warnings/enable warnings
mysql-test/t/query_cache.test:
  merge tests
mysql-test/t/range.test:
  merge tests
mysys/charset.c:
  use local file (will merge patch separately)
sql/ha_innodb.cc:
  use local file
sql/log_event.cc:
  new slave_proxy_id handling
sql/slave.h:
  merge
sql/sql_base.cc:
  merge
sql/sql_parse.cc:
  Fixes for counting user connect resourses
  Added function comments for involved functions
sql/sql_select.cc:
  Fix for not doing sort with LIMIT when OPTION_FOUND_ROWS is used
sql/unireg.cc:
  merge fixes
support-files/mysql.server.sh:
  merge fixes

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 sergbook.mylan:/usr/home/serg/Abk/mysql-4.1

BitKeeper/etc/ignore:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_compress.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-bin.c:
  Auto merged
include/mysqld_error.h:
  Merge error messages
mysql-test/r/date_formats.result:
  merge
sql/derror.cc:
  Fixed wront return value
sql/item_timefunc.cc:
  merge
sql/item_timefunc.h:
  merge
sql/mysqld.cc:
  merge
sql/share/czech/errmsg.txt:
  Merge error messages
sql/share/danish/errmsg.txt:
  Merge error messages
sql/share/dutch/errmsg.txt:
  Merge error messages
sql/share/english/errmsg.txt:
  Merge error messages
sql/share/estonian/errmsg.txt:
  Merge error messages
sql/share/french/errmsg.txt:
  Merge error messages
sql/share/german/errmsg.txt:
  Merge error messages
sql/share/greek/errmsg.txt:
  Merge error messages
sql/share/hungarian/errmsg.txt:
  Merge error messages
sql/share/italian/errmsg.txt:
  Merge error messages
sql/share/japanese/errmsg.txt:
  Merge error messages
sql/share/korean/errmsg.txt:
  Merge error messages
sql/share/norwegian-ny/errmsg.txt:
  Merge error messages
sql/share/norwegian/errmsg.txt:
  Merge error messages
sql/share/polish/errmsg.txt:
  Merge error messages
sql/share/portuguese/errmsg.txt:
  Merge error messages
sql/share/romanian/errmsg.txt:
  Merge error messages
sql/share/russian/errmsg.txt:
  Merge error messages
sql/share/serbian/errmsg.txt:
  Merge error messages
sql/share/slovak/errmsg.txt:
  Merge error messages
sql/share/spanish/errmsg.txt:
  Merge error messages
sql/share/swedish/errmsg.txt:
  Merge error messages
sql/share/ukrainian/errmsg.txt:
  Merge error messages

BitKeeper/etc/ignore:
  added libmysqld/strfunc.cc
mysql-test/t/overflow.test:
  Fix error messages
sql/unireg.h:
  Add defines for allocation of DATE/TIME/DATETIME strings

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

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


sql/sql_select.cc:
  Auto merged

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