fix for a bug with derived tables and query cache
ix for a charset bug in timestamp


mysql-test/r/multi_update.result:
  aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
  fix for query cache with derived tables
mysql-test/t/multi_update.test:
  aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
  Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
  fix for a bug with derived tables and query cache
sql/field.cc:
  fix for a charset bug in timestamp
sql/sql_parse.cc:
  aliases with multi-table updates / deletes
sql/sql_yacc.yy:
  aliases with multi-table updates / deletes

mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  Fixes for merge ...

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


sql/sql_select.cc:
  Auto merged

just one argument from command line.

Fixed a bug in interactive 'connect' command, which earlier
couldn't take quoted arguments.

How-to-repeat:

mysql> connect `stupid db` localhost

into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1

mysql-test/r/update.result:
  Test for update with subselect and derived table ...
mysql-test/t/update.test:
  Test for update with subselect and derived table ...
sql/sql_union.cc:
  Fix for usage of ORDER BY ... and / or LIMIT .... without braces

to the start of mysql-test-run

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

sql/share/czech/errmsg.txt:
  Chezh
sql/share/danish/errmsg.txt:
  Danish
sql/share/dutch/errmsg.txt:
  Dutch
sql/share/estonian/errmsg.txt:
  Estonian
sql/share/french/errmsg.txt:
  French
sql/share/german/errmsg.txt:
  German
sql/share/greek/errmsg.txt:
  Greek
sql/share/hungarian/errmsg.txt:
  Hungarian
sql/share/italian/errmsg.txt:
  Italian
sql/share/japanese/errmsg.txt:
  Japanese
sql/share/korean/errmsg.txt:
  Korean
sql/share/norwegian-ny/errmsg.txt:
  Norwegian-ny
sql/share/norwegian/errmsg.txt:
  Norwegian
sql/share/polish/errmsg.txt:
  polish
sql/share/portuguese/errmsg.txt:
  Portuguese
sql/share/romanian/errmsg.txt:
  Romainian
sql/share/russian/errmsg.txt:
  Russian
sql/share/serbian/errmsg.txt:
  Serbian
sql/share/slovak/errmsg.txt:
  Slovak
sql/share/spanish/errmsg.txt:
  spanish
sql/share/swedish/errmsg.txt:
  Swedish
sql/share/ukrainian/errmsg.txt:
  Ukrainian

sql/share/english/errmsg.txt:
  Correct Error messages to match actual behavior

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

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


sql/item.cc:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

I still have to make a test case for :

UPDATE from sub-select with derived table


mysql-test/r/multi_update.result:
  Test for found rows in multi-table update
mysql-test/r/subselect.result:
  Fix for new syntax for UNION's
mysql-test/t/multi_update.test:
  Test for found rows in multi-table update
mysql-test/t/subselect.test:
  Fix for new syntax for UNION's
sql/sql_cache.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_derived.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_parse.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_show.cc:
  Fix for th eshow of replication status
sql/sql_yacc.yy:
  Three fixes.
  
  One for not allowing mixing of braces and non-braces in UNION's
  
  Second one for table aliases in multi-table deletes / updates
  
  Third one for using derived tables within sub-selects for 
  UPDATE / DELETE commands

into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1

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

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

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

into mysql.com:/space/my/mysql-4.1

  ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!


include/mysql_com.h:
  ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!

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

  COUNT(DISTINCT expr) and charset related test


mysql-test/r/ctype_many.result:
  COUNT(DISTINCT expr) and charset related test

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

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa


sql/item_strfunc.cc:
  Auto merged

It's needed by ODBC code.

ha_berkeley::rename_table() has been added (SCRUM)


bdb/db/db_open.c:
  patches from sleepycat.com have been applied
bdb/log/log_put.c:
  patches from sleepycat.com have been applied
bdb/mp/mp_fopen.c:
  patches from sleepycat.com have been applied
bdb/rep/rep_record.c:
  patches from sleepycat.com have been applied
bdb/txn/txn.c:
  patches from sleepycat.com have been applied
sql/ha_berkeley.cc:
  ha_berkeley::rename_table() has been added
sql/ha_berkeley.h:
  ha_berkeley::rename_table() has been added