include/mysqld_error.h:
  resolve error message
sql/mysqld.cc:
  resolve option
sql/set_var.cc:
  resolve variable
sql/share/english/errmsg.txt:
  resolve error message
sql/sql_class.h:
  resolve

BitKeeper/etc/logging_ok:
  auto-union

correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL


mysql-test/r/func_gconcat.result:
  change work with NULL
mysql-test/t/func_gconcat.test:
  add test on NULL
sql/item_sum.cc:
  correct sql_alloc, ORDER BY and NULL value
  add comments
sql/sql_class.h:
  move test msg_arg

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

LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
functions have been added (as synonyms for GEOMFROMWKB()).


mysql-test/t/gis.test:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).
sql/lex.h:
  GEOMCOLLFROMWKB(), GEOMETRYCOLLECTIONFROMWKB(),
  LINEFROMWKB(), LINESTRINGFROMWKB(), MLINEFROMWKB(), MPOINTFROMWKB(),
  MPOLYFROMWKB(), MULTILINESTRINGFROMWKB(), MULTIPOINTFROMWKB(),
  MULTIPOLYGONFROMWKB(), POINTFROMWKB(), POLYFROMWKB(), POLYGONFROMWKB()
  functions have been added (as synonyms for GEOMFROMWKB()).

into george.bitbike.com:/home/arjen/mysql-4.1

BitKeeper/deleted/.del-prepare.texi~20a263ee73a181f:
  Delete: Docs/prepare.texi

myisam/mi_test3.c:
  Fixed compiler warning
myisam/rt_test.c:
  Fixed compiler warning

  cp1257 is Lithuanian sorting


sql/share/charsets/Index.xml:
  cp1257 is Lithuanian sorting
sql/share/charsets/cp1257.xml:
  cp1257 is Lithuanian sorting

pclatin1 -> cp850
pclatin2 -> cp852


BitKeeper/deleted/.del-pclatin1.xml~d42c4a35e61526fa:
  Delete: sql/share/charsets/pclatin1.xml
BitKeeper/deleted/.del-pclatin2.xml~419e68f6672a99a:
  Delete: sql/share/charsets/pclatin2.xml

  It's now working under HTTPD as a CGI. Very convenient!


mysys/charset2html.c:
  It's now working under HTTPD as a CGI. Very convenient!

  We don't need separate hash_sort() and hash_caseup()
  We don't need tosort(). strnxfrm will do the same.

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

  We finally decided that national character set is utf8 :)


sql/sql_string.cc:
  We finally decided that national character set is utf8 :)

BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc

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

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

  Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.


sql/lex.h:
  Use MBRContains() style for what we have implemented. Contains() will be used for real "contains" relation in the future.

geometry type (POINT, LINESTRING, etc)
and changed all into "GEOMETRY".

client/mysql.cc:
  NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
  NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
  NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
  Add conditional for NetWare
mysys/my_init.c:
  Changes to netware_init
mysys/my_pthread.c:
  NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
  NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
  Add zlib to environment variables
netware/Makefile.am:
  Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
  Made bin directory files more flexible for alternate platforms, without unnecessary repetition

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

  strcasecmp -> my_strcasecmp
  This fix compilation problem on windows


mysys/charset.c:
  strcasecmp -> my_strcasecmp
  This fix compilation problem on windows

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


sql/item.cc:
  Auto merged

#195

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

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


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

  Fix for possible failure reason on big-endian machines
  ,


sql/sql_yacc.yy:
  Fix for possible failure reason on big-endian machines
  ,

sql/item_strfunc.cc:
  uint is better here