client/mysqldump.c:
  Merge bug fix
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Merge bug fix

client/mysqldump.c:
  Optimize away a call to strend() by using return value of my_snprintf()

  Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.


sql/sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
  Added test cases for bug #7914.
mysql-test/r/olap.result:
  Added test cases for bug #7914.

  Added missing ';'.


sql/sql_yacc.yy:
  Added missing ';'.

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


mysql-test/t/range.test:
  Auto merged

mysql-test/mysql-test-run.sh:
  always use --no-defaults
mysql-test/t/range.test:
  range.test does not requires innodb

  updated error message for ndb


ndb/src/ndbapi/ndberror.c:
  updated error message for ndb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/data0/mysqldev/my/mysql-4.1-build


configure.in:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1

into mysql.com:/home/psergey/mysql-4.1-bug10095

client/mysql.cc:
  Remove usage of c_ptr_safe() as this causes a linkage problem when compiling MySQL without inline functions
sql/sql_base.cc:
  Don't use c_ptr_safe() on this string as this causes a realloc and the String object (allocated by sql_yacc.yy) is never freed

into mysql.com:/home/psergey/mysql-4.1-bug10221

mysql-test/r/subselect.result:
  test fro bug 10020
mysql-test/t/subselect.test:
  bug 10020 test suite
sql/item.cc:
  any constant allowed here BUG#10020)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings


client/mysqltest.c:
  To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings

  To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory


mysql-test/mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
client/mysqltest.c:
  To solve bug#6193, also reset require when using 'eval' for running query

  Added option --vardir=<directory> for feature bug#10096


mysql-test/mysql-test-run.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_process.pl:
  Added option --vardir=<directory> for feature bug#10096
mysql-test/lib/mtr_report.pl:
  Added option --vardir=<directory> for feature bug#10096

  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates


mysql-test/lib/init_db.sql:
  Initial db updates
mysql-test/mysql-test-run.pl:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"

  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file


mysql-test/suppress.purify:
  Purify suppress file
mysql-test/mysql-test-run.sh:
  Use Purify suppress file
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
client/mysqltest.c:
  Not to conflict with Windows return code 2 for "not found", use 62 for "skip"

into mysql.com:/Users/kent/mysql/cw/mysql-4.1

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


libmysql/libmysql.c:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged

BitKeeper/deleted/.del-outfile2.result~fb702ee2518d8e6d:
  Delete: mysql-test/r/outfile2.result
libmysql/libmysql.c:
  Fix indentation for new function mysql_set_character_set()
mysql-test/r/alter_table.result:
  Fix test to be in same order as in 4.0
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert_update.result:
  Add extra test for insert into ... on duplicate key upate
mysql-test/r/outfile.result:
  After merge fix
mysql-test/t/alter_table.test:
  Fix test to be in same order as in 4.0
mysql-test/t/insert_update.test:
  Add extra test for insert into ... on duplicate key upate
mysql-test/t/outfile.test:
  After merge fix
sql/item_func.cc:
  After merge fix
sql/sql_table.cc:
  After merge fix

Not to be pushed into 5.0 as there it's fixed differently (in the new
format of error messages)


sql/share/danish/errmsg.txt:
  Fix wrong format specifier in an error message.
sql/share/serbian/errmsg.txt:
  Fix wrong format specifier in an error message.

way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal. 


mysql-test/r/myisam.result:
  Testcase for BUG#9622
mysql-test/t/myisam.test:
  Testcase for BUG#9622

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/outfile2.result:
  Merge rename: mysql-test/r/outfile.result -> mysql-test/r/outfile2.result
myisam/mi_key.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/t/alter_table.test:
  Merge
mysql-test/t/outfile.test:
  Merge
sql/item_func.cc:
  Merge
sql/share/czech/errmsg.txt:
  Merge
sql/share/danish/errmsg.txt:
  Merge
sql/share/dutch/errmsg.txt:
  Merge
sql/share/english/errmsg.txt:
  Merge
sql/share/estonian/errmsg.txt:
  Merge
sql/share/french/errmsg.txt:
  Merge
sql/share/german/errmsg.txt:
  Merge
sql/share/greek/errmsg.txt:
  Merge
sql/share/hungarian/errmsg.txt:
  Merge
sql/share/italian/errmsg.txt:
  Merge
sql/share/japanese/errmsg.txt:
  Merge
sql/share/korean/errmsg.txt:
  Merge
sql/share/norwegian-ny/errmsg.txt:
  Merge
sql/share/norwegian/errmsg.txt:
  Merge
sql/share/polish/errmsg.txt:
  Merge
sql/share/portuguese/errmsg.txt:
  Merge
sql/share/romanian/errmsg.txt:
  Merge
sql/share/russian/errmsg.txt:
  Merge
sql/share/slovak/errmsg.txt:
  Merge
sql/share/spanish/errmsg.txt:
  Merge
sql/share/swedish/errmsg.txt:
  Merge
sql/share/ukrainian/errmsg.txt:
  Merge
sql/sql_table.cc:
  Merge
sql/sql_yacc.yy:
  Keep old
sql/unireg.cc:
  Merge

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

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

Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045)


myisam/mi_key.c:
  Fixed wrong buffer usage for auto-increment key with blob part that caused
  CHECK TABLE to report that the table was wrong. (Bug #10045)
mysql-test/r/auto_increment.result:
  New test case
mysql-test/t/auto_increment.test:
  New test case

    bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
    libmysqld/examples/mysql.cc linking problem


sql/ha_blackhole.cc:
  bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc:
  libmysqld/examples/mysql.cc linking problem

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

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

  InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)


innobase/row/row0mysql.c:
  InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)

as a work around for #8317 and #9637

This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.


libmysql/libmysql.def:
  added new function mysql_set_character_set

mysql-test/r/select.result:
  Better error message
mysql-test/t/select.test:
  Better error message
sql/hostname.cc:
  Join identical code
sql/sql_yacc.yy:
  Combine code (and get a better error message)
strings/ctype-ucs2.c:
  Cast pointer differencess

  Include <sys/ttydefaults.h> for CodeWarrior and CTRL define


cmd-line-utils/libedit/readline/readline.h:
  Include <sys/ttydefaults.h> for CodeWarrior and CTRL define

Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236


mysql-test/r/alter_table.result:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
mysql-test/t/alter_table.test:
  More test for bug #6236 (CREATE TABLE didn't properly count not null columns for primary keys)
sql/handler.h:
  Add counter for null fields
sql/sql_table.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.
sql/unireg.cc:
  Change create_field->offset to store offset from start of fields, independent of null bits.
  Count null_bits separately from field offsets and adjust them in case of primary key parts.

  files - include config.h instead (compile fix for FreeBSD and AIX
  4.3/5.2)


cmd-line-utils/libedit/makelist.sh:
  - don't include sys.h directly in the autogenerated files - include
    config.h instead (compile fix for FreeBSD and AIX 4.3/5.2)