myisam/mi_key.c:
  SCCS merged

only MyISAM is fixed


include/m_ctype.h:
  my_charpos() macro
myisam/mi_key.c:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/r/binary.result:
  new test
mysql-test/r/key.result:
  apply UNIQUE constrain correctly for multi-byte charsets
mysql-test/t/binary.test:
  new test
mysql-test/t/func_gconcat.test:
  make test to pass w/o InnoDB
mysql-test/t/key.test:
  apply UNIQUE constrain correctly for multi-byte charsets

ENUM and SET type didn't compute their length correctly.
That showed up for example while converting into a CHAR column.

  LEFT() didn't work well in some cases.


sql/item_strfunc.cc:
  LEFT() didn't work well in some cases.
mysql-test/t/ctype_utf8.test:
  LEFT() didn't work well in some cases.
mysql-test/r/ctype_utf8.result:
  LEFT() didn't work well in some cases.

  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.


myisam/mi_key.c:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/t/ctype_utf8.test:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.
mysql-test/r/ctype_utf8.result:
  bug 4521: unique key prefix interacts poorly with utf8: fixed length key fix.

  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings


sql/item.cc:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/t/ctype_ucs.test:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings
mysql-test/r/ctype_ucs.result:
  #5024 [Ver]: Server crashes with queries on fields with certain charset/collation settings

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

into mysql.com:/usr/home/bar/mysql-4.1

Fix for MyISAM with prefix compressed keys.

into hundin.mysql.fi:/home/marko/k/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-874

do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root')
(such behaviour is a feature of mysql_real_connect(), see the manual).


mysql-test/t/grant_cache.test:
  do not use '' as user in tests, because it picks the Unix login (which gives unexpected results if it is 'root').
sql/slave.cc:
  a comment

into mysql.com:/home/mydev/mysql-4.1-4100

BitKeeper/etc/ignore:
  added ndb/test/ndbapi/create_all_tabs ndb/test/ndbapi/create_tab ndb/test/ndbapi/drop_all_tabs ndb/test/ndbapi/flexAsynch ndb/test/ndbapi/flexBench ndb/test/ndbapi/flexHammer ndb/test/ndbapi/flexTT ndb/test/ndbapi/testBackup ndb/test/ndbapi/testBasic ndb/test/ndbapi/testBasicAsynch ndb/test/ndbapi/testBlobs ndb/test/ndbapi/testDataBuffers ndb/test/ndbapi/testDeadlock ndb/test/ndbapi/testDict ndb/test/ndbapi/testIndex ndb/test/ndbapi/testMgm ndb/test/ndbapi/testNdbApi ndb/test/ndbapi/testNodeRestart ndb/test/ndbapi/testOIBasic ndb/test/ndbapi/testOperations ndb/test/ndbapi/testRestartGci ndb/test/ndbapi/testScan ndb/test/ndbapi/testScanInterpreter ndb/test/ndbapi/testScanPerf ndb/test/ndbapi/testSystemRestart ndb/test/ndbapi/testTimeout ndb/test/ndbapi/testTransactions ndb/test/ndbapi/test_event ndb/test/ndbapi/bank/bankCreator ndb/test/ndbapi/bank/bankMakeGL ndb/test/ndbapi/bank/bankSumAccounts ndb/test/ndbapi/bank/bankTimer ndb/test/ndbapi/bank/bankTransactionMaker ndb/test/ndbapi/bank/bankValidateAllGLs
   ndb/test/ndbapi/bank/testBank ndb/test/run-test/atrt ndb/test/tools/copy_tab ndb/test/tools/create_index ndb/test/tools/hugoCalculator ndb/test/tools/hugoFill ndb/test/tools/hugoLoad ndb/test/tools/hugoLockRecords ndb/test/tools/hugoPkDelete ndb/test/tools/hugoPkRead ndb/test/tools/hugoPkReadRecord ndb/test/tools/hugoPkUpdate ndb/test/tools/hugoScanRead ndb/test/tools/hugoScanUpdate ndb/test/tools/ndb_cpcc ndb/test/tools/restart ndb/test/tools/verify_index

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

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

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

Resources in SUMA


ndb/src/kernel/blocks/suma/Suma.cpp:
  release table attributes/fragments when releasing table.
  add #if 0-ed READ_CONFIG_REQ (todo)

into mysql.com:/home/wax/mysql/mysql-4.1group_concat

Now replacing domain name by 'err'. If host name doesn't have a
domain name, '.err' is appended as before.

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb

testDict -n FragmentType


ndb/test/ndbapi/testDict.cpp:
  Drop table before trying to create with special fragmentation
ndb/test/ndbapi/testScan.cpp:
  testScan -n ScanRandomTable
ndb/test/src/NDBT_Tables.cpp:
  testScan -n ScanRandomTable

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

BitKeeper/etc/ignore:
  added ndb/src/cw/cpcd/ndb_cpcd ndb/src/kernel/ndbd ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/mgmclient/ndb_mgm ndb/src/mgmsrv/ndb_mgmd ndb/tools/ndb_delete_all ndb/tools/ndb_desc ndb/tools/ndb_drop_index ndb/tools/ndb_drop_table ndb/tools/ndb_select_all ndb/tools/ndb_select_count ndb/tools/ndb_show_tables ndb/tools/ndb_waiter

ctype-simple.c:
  Check that unicode map was loaded
cp852.xml:
  Missing cp852_bin was added.


sql/share/charsets/cp852.xml:
  Missing cp852_bin was added.
strings/ctype-simple.c:
  Check that unicode map was loaded

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

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

mysys/mf_keycache.c:
  bug fixed: when inited=0, can_be_used should be 0 too. (BUG#4901)
  end spaces removed (no merge problems as this file doesn't change much)

  Slovak collation didn't work: typo fix in the tailoring rules


strings/ctype-uca.c:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/r/ctype_uca.result:
  Slovak collation didn't work: typo fix in the tailoring rules
mysql-test/t/ctype_uca.test:
  Slovak collation didn't work: typo fix in the tailoring rules

innobase/buf/buf0flu.c:
  buf_flush_write_block_low(): Warn about UNIV_LOG_DEBUG only once
innobase/log/log0recv.c:
  log_block_checksum_is_ok_or_old_format(): Disable the check
  if UNIV_LOG_DEBUG is defined

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

ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Don't memset pages
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Don't memset pages
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Don't memset pages

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