Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes


sql/sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
mysql-test/r/ctype_utf8.result:
  Added a test case for bug #11167.
mysql-test/t/ctype_utf8.test:
  Added a test case for bug #11167.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/var/tmp/sslbug/mysql-4.1

into xiphis.org:/usr/home/antony/work2/p1-bug11028.3

  Report error instead of crashing


mysql-test/r/create.result:
  Test for bug 11028
mysql-test/t/create.test:
  Test for bug 11028
sql/sql_table.cc:
  fix for null db name

into mysql.com:/home/gluh/MySQL/Merge/4.1

mysql-test/r/ps_7ndb.result:
  fix result file

  generate proper error message if we use SET ... = NULL for 'set'
  variables

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

a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.).

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

  small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked

bug#10711
bug#10058
bug#9363
bug#9025
bug#8918


ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Use UintPtr when computing page address to make sure that Uint32 does not overflow

into mysql.com:/var/tmp/sslbug/mysql-4.1


include/my_global.h:
  Auto merged

BUG#10675 - MySQL fails to build with --openssl on Mac OS X 10.4
BUG#11150 - HP-UX yaSSL/OpenSSL configure/header problem
Remove obsolete code.


include/my_global.h:
  Obsolete code removed. OpenSSL doesn't have crypt anymore (it was dropped in ~2003).
  This patch fixes compilation failures with both OpenSSL and yaSSL on systems where
  crypt was defined in unistd.h.
  Conclusion is we do not use OpenSSL's crypt unless it wasn't defined in
  unistd.h/crypt.h and it was defined in old OpenSSL.

  Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts


ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure that entire stopGCP is in log
ndb/tools/restore/Restore.cpp:
  
    Notice: this will not group and commit the deltas listed below
    into a ChangeSet, because there are no ChangeSet comments.
    Click [Checkin] again to check in only the commented deltas,
    or type Control-l to go back and provide ChangeSet comments.
ndb/tools/restore/Restore.hpp:
  Keep track of last gci to next iteration
ndb/tools/restore/consumer_restore.cpp:
  Handle insert in log
  Only allow certain errors

This was necessary because the old code would return 
"w+" for O_RDONLY|O_SHARE for example.


mysys/my_fopen.c:
  improved mapping from numerical open codes to string fopen codes.

into mdk10.(none):/home/reggie/bk/41test3


sql/sql_acl.cc:
  Auto merged

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

check table->file->inited to catch incorrect calling sequence.


mysql-test/r/innodb_handler.result:
  bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
mysql-test/t/innodb_handler.test:
  bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
sql/sql_handler.cc:
  cleanup: call index_init *correctly*, not every time.
  check table->file->inited to catch incorrect calling sequence.

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

into rurik.mysql.com:/home/igor/mysql-4.1

  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.


sql/sql_class.cc:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_1general.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_2myisam.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_3innodb.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_4heap.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
mysql-test/r/ps_5merge.result:
  Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.

BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged

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

  incorrect handling of writeTuple with multi op transaction


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  1) Pass operation instead of insertIsDone to LQH
  2) transform operation correctly when in parallell que
     (multi op within same trans)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Let ACC decide what operation was performed when WRITE
ndb/test/ndbapi/testNdbApi.cpp:
  Add testcase for bug 11133
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug 11133

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

Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server


myisam/mi_key.c:
  Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
myisam/mi_rnext_same.c:
  Fixed wrong arguments to ha_key_cmp()
  This caused a compare to fail if we first found a key with end space and then same key without end space
mysql-test/r/ctype_utf8.result:
  Additional test
mysql-test/t/ctype_utf8.test:
  Additional test

  Removed an extra space char.


sql/item_buff.cc:
  Removed an extra space char.

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.


mysql-test/r/group_by.result:
  Added a test case for bug #11088.
mysql-test/t/group_by.test:
  Added a test case for bug #11088.
sql/item.h:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.
sql/item_buff.cc:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.
sql/sql_select.cc:
  Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB fields.
  Now the size of the buffer is limited by max_sort_length.

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

into  mysql.com:/Users/emurphy/src/work/mysql-4.1

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

produces invalid query results

mi_key.c:
  well_formed_length should be executed before space trimming, not after.
ctype_utf8.test:
ctype_utf8.result:
  adding test.


myisam/mi_key.c:
  Bug#10253: ompound index length and utf8 char set produces invalid query results
  well_formed_length should be executed before space trimming, not after.
mysql-test/r/ctype_utf8.result:
  adding test.
  adding test.
mysql-test/t/ctype_utf8.test:
  adding test.

  when doing "make install" (they are not needed/useful) outside the build tree. Added
  "mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)


scripts/Makefile.am:
  - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
    in "make install" (BUG#10676)
support-files/mysql.spec.sh:
  - added mysql_client_test to the "bench" subpackage (BUG 10676)
  - use "mysqldatadir" variable instead of hard-coding the path multiple times
  - use the "mysqld_user" variable on all occasions a user name is referenced
  - removed (incomplete) Brazilian translations
  - removed redundant release tags from the subpackage descriptions

into mysql.com:/home/stewart/Documents/MySQL/4.1/main

BitKeeper/etc/ignore:
  Added scripts/mysqlhotcopy.sh.rej to the ignore list
scripts/mysqlhotcopy.sh:
  BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
  that --record-log-pos option will work with all versions from 3.23
  forward and will not break again in the future if additional columns
  are added.

  Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.


strings/ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
mysql-test/t/ctype_cp1250_ch.test:
  Adding test.
mysql-test/r/ctype_cp1250_ch.result:
  Adding test.