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

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


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

It's now passed as args[0]. This fix allowed to resuse 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 teton.kitebird.com:/home/paul/mysql-4.1

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

if some of the arguments is STRING_RESULT the STRING_RESULT
else if some of the arguments is REAL_RESULT then REAL_RESULT
else INT_RESULT 

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


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

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


sql/item_strfunc.cc:
  Auto merged

Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.


mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.

sql/lex.h:
  Add SUBSTR aliased to SUBSTRING
sql/item_strfunc.cc:
  Implement SUBSTR negative offset
mysql-test/t/func_str.test:
  New tests for SUBSTR
mysql-test/r/func_str.result:
  Updated SUBSTR results

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

  Data was not converted when ALTER TABLE CHAGE changed a field character set.


sql/field_conv.cc:
  Data was not converted when ALTER TABLE CHAGE changed a field character set.

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

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


sql/item_func.h:
  Auto merged

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)