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

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

   (to disable assertions)


include/my_dbug.h:
   - make sure to define NDEBUG, when DBUG_OFF is defined (to disable
     assertions)

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


sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

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

sql/item_strfunc.cc:
  We don't need tmp_value member here.
sql/item_strfunc.h:
  We don't need tmp_value member here.

   (too few arguments)


regex/regcomp.c:
   - compile fix spotted on Mac OS X (too few arguments)

into mc05.(none):/space2/tomas/4.1

mysql-test/ndb/ndbcluster.sh:
  Change mode to -rw-rw-r--

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

  Compilation failure fix.


strings/ctype-uca.c:
  Compilation failure fix.

BUILD/compile-pentium-max:
   - re-enabled NDB cluster

Polish collation fix.
Slovak collation fix.
Testing all language orders.

into mysql.com:/Users/mikron/wl1823


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  small blob fix


ndb/src/ndbapi/NdbBlob.cpp:
  small blob fix
ndb/test/ndbapi/testBlobs.cpp:
  small blob fix

into mysql.com:/Users/mikron/wl1823

into mysql.com:/space/pekka/ndb/version/my41-blobs

1) update atrt to support mysqld
2) add example
3) add our current basic tests

Plan is to introduce --flag, but Tomas will do that later.

into teton.kitebird.com:/home/paul/bk/mysql-4.1

  Fix couple of typos.


include/sql_state.h:
  Fix couple of typos.

E.g. 'Ch' is treated as a separate letter in Czech,
not as a combination of C+h.

  Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks


Build-tools/mysql-copyright:
  Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks

myisam/mi_unique.c:
  warning removed

acinclude.m4:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.4014

use MYSQL_TCP_PORT instead of 3306 in tests


client/mysqltest.c:
  don't hardcode variables to be taken from environment.
mysql-test/mysql-test-run.sh:
  MYSQL_TCP_PORT instead of 3306
mysql-test/t/rpl000015.test:
  MYSQL_TCP_PORT instead of 3306

into mysql.com:/home/jonas/src/mysql-4.1-ndb

  Reuse some code between simple and UCA collations.


mysys/charset.c:
  Reuse some code between simple and UCA collations.

- For simple character sets: from_uni convertion table.
- For UCA: alternative weight arrays.
Use mbminlen instead of MY_CS_NONTEXT