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

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

       bug #6933: error in the tests/grant.pl test).

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

  bug #6919

- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.

A test doesn't seem to be possible.

  Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
  Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
os0file.c:
  Use re-entrant readdir_r where available
ut0ut.c:
  Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though

Check UCS2 trailing spaces.

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

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

  replace with charsets
  check update of primary key wo/ normalizing
  

  Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)

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

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

two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.

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

  Rename lock_table_exclusive to lock_is_table_exclusive
  (somehow this change was omitted from last changeset)

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

fixed so that warning on missing support for engine only printed once even if option given multiple times

    added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit

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

  If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this

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

  Remove compiler warning as I had forgotten an include file

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

contains auto_increment columns.  (Bug #6633)

  ndb now runs ps tests just like the others

  fixed erroneous previous push

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

added ndb_mgm_check_connection when error is printed