into teton.kitebird.com:/home/paul/mysql-4.1

   the server error messages had been modified in errmsg.txt


mysql-test/r/create.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/drop.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/rpl000009.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/symlink.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/warnings.result:
   - Updated error message in result after errmsg.txt has been modified

into mashka.mysql.fi:/home/my/mysql-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged

into ice.snake.net:/Users/paul/mysql-4.1

into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged

mysql-test/r/cast.result:
  Changes for SAPDB date/time finctions

into myvenu.com:/home/venu/work/sql/dev-4.1

include/mysql.h:
  add mysql_stmt_reset prototype
include/mysql_com.h:
  add COM_STMT_RESET
libmysql/libmysql.def:
  Add mysql_stmt_reset def
sql/sql_prepare.cc:
  Fix selects hang after windows slowdown issue fix (send_fields)
sql/sql_parse.cc:
  Add COM_STMT_RESET
sql/mysql_priv.h:
  add defination of mysql_stmt_reset

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


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

not ending with period into single sentence.)


sql/share/czech/errmsg.txt:
  Error message edits.
sql/share/danish/errmsg.txt:
  Error message edits.
sql/share/dutch/errmsg.txt:
  Error message edits.
sql/share/english/errmsg.txt:
  Error message edits.
sql/share/french/errmsg.txt:
  Error message edits.
sql/share/german/errmsg.txt:
  Error message edits.
sql/share/italian/errmsg.txt:
  Error message edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message edits.
sql/share/norwegian/errmsg.txt:
  Error message edits.
sql/share/polish/errmsg.txt:
  Error message edits.
sql/share/portuguese/errmsg.txt:
  Error message edits.
sql/share/romanian/errmsg.txt:
  Error message edits.
sql/share/serbian/errmsg.txt:
  Error message edits.
sql/share/slovak/errmsg.txt:
  Error message edits.
sql/share/spanish/errmsg.txt:
  Error message edits.
sql/share/swedish/errmsg.txt:
  Error message edits.

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

(now it return correct results. Test was commited before, but it is not pushed,
BUG# is not registered, because bug was introduced after release)


sql/sql_select.cc:
  fixed subselect with to temporary tables executing
sql/sql_select.h:
  fixed subselect with to temporary tables executing

Added framework to create/drop and manager buffers for multiple key caches


include/my_getopt.h:
  Fixed prototype
include/my_sys.h:
  Added (temporary) KEY_CACHE type
include/mysqld_error.h:
  New error messages
mysql-test/r/select_safe.result:
  Updated test results
mysql-test/r/variables.result:
  Updated test results
mysys/my_getopt.c:
  Fixed bugs with GET_ASK_ADDR
sql/Makefile.am:
  Make sql_yacc.o depend on all header files in sql directory
sql/item_func.cc:
  Added support for variable components
sql/mysql_priv.h:
  Added support for variable components
sql/mysqld.cc:
  Added support for multiple key caches
sql/set_var.cc:
  Added support for multiple key caches
sql/set_var.h:
  Added support for multiple key caches
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/serbian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_lex.cc:
  Fixes for quoting of variables.
sql/sql_parse.cc:
  Fix after changing prototype for get_system_var
sql/sql_show.cc:
  Fix after introducing variable components
sql/sql_yacc.yy:
  Support for variables with components (To support multiple key caches)

fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables


mysql-test/r/func_gconcat.result:
  removed warning in test
  fixed table tnames (should be tN, where N is number)
mysql-test/t/func_gconcat.test:
  removed warning in test
  fixed table tnames (should be tN, where N is number)
sql/item_sum.cc:
  added debug information
  fixed memory leak in group_concat function

initialization of item_thd moved to constructor (in any case we need thd in constructor)
initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items


mysql-test/r/func_gconcat.result:
  test for BUG#757
mysql-test/t/func_gconcat.test:
  test for BUG#757
sql/item_sum.cc:
  reduced using of slow current_thd/current_lex macro
  initialization of item_thd moved to constructor (in any case we need thd in constructor)
  initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
sql/item_sum.h:
  removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items

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


mysql-test/t/subselect.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into myvenu.com:/home/venu/work/sql/dev-4.1

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.

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

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

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

mysql-test/t/subselect.test:
  fixed test case for no InnoDB

mysql-test/r/handler.result:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
mysql-test/t/handler.test:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
sql/sql_handler.cc:
  fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows

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

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

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

  ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
When a number is compared to a string, character sets and 
collations are not aggregated. e.g. this returned error in 4.1.0:

SELECT 1=_latin2'1';
because character sets was aggregated, and 1 was considered as
a string of latin1 charset during this aggregation.

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

mysql-test/r/func_gconcat.result:
  Update results
mysql-test/t/func_gconcat.test:
  Make tests repeatable.  The problem is that due to floating point handling / qsort implementation the way rows are read may differ between versions

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


sql/sql_select.cc:
  Auto merged