post-merge fix.
  ,

  result update (default value changed from 4.1 to 5.0)

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita

  Wrong help string fix.

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

in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().

into neptunus.(none):/home/msvensson/mysql/bug9303

 and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

server" to the test suite, the bug is no longer repeatable.

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

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

"Server crashes when running out of connections"

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

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

into mysql.com:/media/sda1/mysql/mysql-5.0-6282

(the bug itself is no longer repeatable).

"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared

    report correct errror in MODE_NO_AUTO_CREATE_USER
    cleanup
after merge fixes

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0

  Fix typo.

  Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

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

applications with embedded server to connect to external servers too.
(required for Connector/OO.org)

into neptunus.(none):/home/msvensson/mysql/mysql-4.1