include/mysqld_error.h:
  more generic error code
mysql-test/r/func_compress.result:
  update after message change
mysql-test/r/loaddata.result:
  update after message change
mysql-test/r/warnings.result:
  update after message change
sql/share/czech/errmsg.txt:
  message change
sql/share/danish/errmsg.txt:
  message change
sql/share/dutch/errmsg.txt:
  message change
sql/share/english/errmsg.txt:
  message change
sql/share/estonian/errmsg.txt:
  message change
sql/share/french/errmsg.txt:
  message change
sql/share/german/errmsg.txt:
  message change
sql/share/greek/errmsg.txt:
  message change
sql/share/hungarian/errmsg.txt:
  message change
sql/share/italian/errmsg.txt:
  message change
sql/share/japanese/errmsg.txt:
  message change
sql/share/korean/errmsg.txt:
  message change
sql/share/norwegian-ny/errmsg.txt:
  message change
sql/share/norwegian/errmsg.txt:
  message change
sql/share/polish/errmsg.txt:
  message change
sql/share/portuguese/errmsg.txt:
  message change
sql/share/romanian/errmsg.txt:
  message change
sql/share/russian/errmsg.txt:
  message change
sql/share/slovak/errmsg.txt:
  message change
sql/share/spanish/errmsg.txt:
  message change
sql/share/swedish/errmsg.txt:
  message change
sql/share/ukrainian/errmsg.txt:
  message change

sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
include/mysqld_error.h:
  for merge
mysql-test/r/loaddata.result:
  for merge
mysql-test/r/warnings.result:
  for merge
sql/share/czech/errmsg.txt:
  for merge
sql/share/danish/errmsg.txt:
  for merge
sql/share/dutch/errmsg.txt:
  for merge
sql/share/english/errmsg.txt:
  for merge
sql/share/estonian/errmsg.txt:
  for merge
sql/share/french/errmsg.txt:
  for merge
sql/share/german/errmsg.txt:
  for merge
sql/share/greek/errmsg.txt:
  for merge
sql/share/hungarian/errmsg.txt:
  for merge
sql/share/italian/errmsg.txt:
  for merge
sql/share/japanese/errmsg.txt:
  for merge
sql/share/korean/errmsg.txt:
  for merge
sql/share/norwegian-ny/errmsg.txt:
  for merge
sql/share/norwegian/errmsg.txt:
  for merge
sql/share/polish/errmsg.txt:
  for merge
sql/share/portuguese/errmsg.txt:
  for merge
sql/share/romanian/errmsg.txt:
  for merge
sql/share/russian/errmsg.txt:
  for merge
sql/share/slovak/errmsg.txt:
  for merge
sql/share/spanish/errmsg.txt:
  for merge
sql/share/swedish/errmsg.txt:
  for merge
sql/share/ukrainian/errmsg.txt:
  for merge

"replicate-wild-*-table=db.% does not apply to ALTER DATABASE"
apply replicate-* rules to ALTER DATABASE like we already do
for CREATE DATABASE/ DROP DATABASE.


sql/sql_parse.cc:
  apply replicate-* rules to ALTER DATABASE like we already do
  for CREATE DATABASE/ DROP DATABASE.

mysql-test/r/loaddata.result:
  update after typo fixed
mysql-test/r/warnings.result:
  update after typo fixed

sql/item_strfunc.cc:
  typo fixed
sql/share/english/errmsg.txt:
  wording

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

update max_used_connections *after* thread_count was increased to take into account the current connection

   in class Statement")

on different systems sprintf("%.3", 1.555499999999999) behaves differently

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


sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

UUID() function


BitKeeper/etc/ignore:
  Added mysys/test_gethwaddr to the ignore list
include/my_sys.h:
  my_gethwaddr()
mysys/Makefile.am:
  my_gethwaddr
sql/item_create.cc:
  UUID() function
sql/item_create.h:
  UUID() function
sql/item_strfunc.cc:
  UUID() function
sql/item_strfunc.h:
  UUID() function
sql/lex.h:
  UUID() function
sql/mysql_priv.h:
  UUID() function
sql/mysqld.cc:
  UUID() function
sql/sql_class.cc:
  cleanup

  Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths


innobase/btr/btr0cur.c:
  Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths

VC++Files/libmysql/libmysql.dsp:
  strtod.c is needed to build the library.
VC++Files/libmysqld/libmysqld.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqldemb/mysqldemb.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqlserver/mysqlserver.dsp:
  Add include directory to resolve problem with including emb_qcache.h.
VC++Files/strings/MASM6x/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/noMASM/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
sql/mysqld.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
sql/set_var.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)


sql/item_strfunc.cc:
  no need to check for HAVE_ISNAN here, it is taken care of in my_global.h
strings/strtod.c:
  do not use static array of pastpoints - it is not portable
  (that is, these numbers are converted to doubles by a local OS strtod,
  and on different systems they get different values)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/mysqld.cc:
  Auto merged

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


sql/mysqld.cc:
  Auto merged

mysql-test/r/bigint.result:
  updated
mysql-test/r/func_misc.result:
  updated
mysql-test/t/bigint.test:
  updated

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

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

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


innobase/rem/rem0cmp.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

mysql-test/t/lock_tables_lost_commit.test:
  Auto merged

mysql-test/t/lock_tables_lost_commit.test:
  Ensure that innodb is compiled in

BitKeeper/etc/ignore:
  auto-union
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisampack/myisampack.dsp:
  Auto merged
acinclude.m4:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/com/com0shm.c:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0proc.h:
  Auto merged
innobase/include/os0thread.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

acinclude.m4:
  Remove innobase/libodbc
innobase/Makefile.am:
  Remove innobase/libodbc
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Fixed wrong merge

Fixed wrong test of database name (affected optimization of ORDER BY)


VC++Files/client/mysqlclient.dsp:
  Add my_file.c
VC++Files/mysys/mysys.dsp:
  Add my_file.c
mysql-test/r/negation_elimination.result:
  Fix wrong test
sql-common/client.c:
  After merge fix
sql/sql_base.cc:
  Fixed testing of database name

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


sql/sql_yacc.yy:
  Auto merged

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