mysql-test/r/func_gconcat.result:
  replace default separator
sql/item_sum.h:
  add fix_length_and_dec() and copy_or_same()
sql/sql_yacc.yy:
  replace default separator

   a lot of broken symlinks to the non-existing tags file (which magically
   causes the source distribution to grow about three times in size
   (most likely a bug in GNU tar - need to investigate if it still happens
   with recent versions)

BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Delete: VC++Files/libmysql/libmysql.def

sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
include/mysqld_error.h:
  merge.
sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  merge.
sql/share/dutch/errmsg.txt:
  merge .
sql/share/english/errmsg.txt:
  merge.
sql/share/estonian/errmsg.txt:
  merge.
sql/share/french/errmsg.txt:
  merge.
sql/share/german/errmsg.txt:
  merge.
sql/share/greek/errmsg.txt:
  merge.
sql/share/hungarian/errmsg.txt:
  e
  merge.
sql/share/italian/errmsg.txt:
  merge.
sql/share/japanese/errmsg.txt:
  merge.
sql/share/korean/errmsg.txt:
  merge.
sql/share/norwegian/errmsg.txt:
  merge.
sql/share/norwegian-ny/errmsg.txt:
  merge.
sql/share/polish/errmsg.txt:
  merge.
sql/share/portuguese/errmsg.txt:
  merge.
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  merge.
sql/share/serbian/errmsg.txt:
  merge.
sql/share/slovak/errmsg.txt:
  merge.
sql/share/spanish/errmsg.txt:
  merge.
sql/share/swedish/errmsg.txt:
  merge.
sql/share/ukrainian/errmsg.txt:
  merge.

sql/mysql_priv.h:
  added have_compress variable
sql/mysqld.cc:
  added have_compress variable
sql/set_var.cc:
  added have_compress variable

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

 - tagged ChangeSet@1.1529 as mysql-4.1.0

instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests

SET CHARACTER SET does

sql/sql_union.cc:
  A better fix for UNION and slow query log.
  This patch also fixes some indentation issues

Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.

configure.in:
  fixed bug with external libedit

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


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/ctype_collate.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
  SET NAMES charset COLLATE collation is new syntax

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


sql/sql_yacc.yy:
  Auto merged

  I wonder how it happend that I compiled this!


sql/sql_yacc.yy:
  I wonder how it happend that I compiled this!

  Optimization of SET NAMES


sql/set_var.cc:
  Optimization of SET NAMES
sql/set_var.h:
  Optimization of SET NAMES
sql/sql_yacc.yy:
  Optimization of SET NAMES

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


mysql-test/r/subselect.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

fixed mustiupdate subselect compatibility

(bug 217)



mysql-test/r/subselect.result:
  test of multi-update & subselect
mysql-test/t/subselect.test:
  test of multi-update & subselect
sql/sql_update.cc:
  added subselect compatibility to query cache
sql/sql_yacc.yy:
  right st_select_lex initialization 
  layout fix

  Cast to unsigned char


sql/sql_cache.cc:
  Cast to unsigned char

into mysql.com:/home/pem/work/mysql-4.1

Removed extraneous error message from german/errmsg.txt.


sql/share/czech/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/danish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/dutch/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/estonian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/french/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/german/errmsg.txt:
  Added missing error message (was only added in english/).
  Removed extraneous error message.
sql/share/greek/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/hungarian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/italian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/japanese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/korean/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian-ny/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/norwegian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/polish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/portuguese/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/romanian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/russian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/serbian/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/slovak/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/spanish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/swedish/errmsg.txt:
  Added missing error message (was only added in english/).
sql/share/ukrainian/errmsg.txt:
  Added missing error message (was only added in english/).

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

  Type


sql/share/charsets/Index.xml:
  Type

mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.

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


sql/item_strfunc.cc:
  Auto merged

BitKeeper/deleted/.del-gis.txt~2dde6d55b3075921:
  Delete: Docs/gis.txt

into mysql.com:/home/pem/work/mysql-4.1

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

  Geometry is now large blob


sql/field.cc:
  Geometry is now large blob

sql/item_sum.cc:
  Fixed bug in warning handling.
sql/item_sum.h:
  Fixed bug in warning handling.
sql/sql_class.h:
  Fixed bug in warning handling.
sql/sql_error.cc:
  Fixed bug in warning handling.
strings/my_vsnprintf.c:
  After merge fix

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


BitKeeper/etc/logging_ok:
  auto-union
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged