BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ndb/include/ndbapi/NdbConnection.hpp:
  release scan op of hupped trans at scan close to save memory
ndb/include/ndbapi/NdbScanOperation.hpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbConnection.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbResultSet.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
  release scan op of hupped trans at scan close to save memory
ndb/tools/desc.cpp:
  release scan op of hupped trans at scan close to save memory

into mysql.com:/M41/mysql-4.1

  Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints


innobase/dict/dict0dict.c:
  Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

into mysql.com:/M41/mysql-4.1


sql/mysqld.cc:
  Auto merged

mysql-test/r/join_outer.result:
  Update results
mysql-test/t/join_outer.test:
  Merge

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

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


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged

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

into mysql.com:/M41/mysql-4.1


sql/share/english/errmsg.txt:
  Auto merged

  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables


sql/ha_innodb.cc:
  Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string


sql/ha_innodb.cc:
  Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

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

  fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.


strings/ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
mysql-test/r/ctype_uca.result:
  fixing test results accordingly.

when using --new" into 4.1 tree.


mysql-test/r/type_timestamp.result:
  Manual merge.
mysql-test/t/type_timestamp.test:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/field.h:
  Manual merge.

into mysql.com:/home/dlenev/src/mysql-4.0-bg8894

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

mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)


mysql-test/r/drop.result:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
mysql-test/t/drop.test:
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/share/english/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/russian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/share/ukrainian/errmsg.txt:
  allow longer "table names" as DROP TABLE puts a list here
sql/sql_table.cc:
  print an error with a function that respects width modifiers (%.64s)

mysql-test/t/lowercase_table_grant.test:
  Disable test with embedded server
mysql-test/t/skip_name_resolve.test:
  Disable test with embedded server
sql/sql_parse.cc:
  Reset server status after a single statement in a multistatement
  query is handled in embedded server so it is not logged twice to
  the slow query log.

mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merge changes
mysql-test/t/ps_1general.test:
  Merge changes

embedded server when a size suffix (K, M, G) is added. (Bug #9472)


sql/mysqld.cc:
  Instead of (re)parsing max_allowed_packet and net_buffer_length
  for the embedded server, just set the global variables to what
  is set in global_system_variables within get_options().

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

into mysql.com:/M41/mysql-4.1

mysql-test/r/ps_grant.result:
  Update results
mysql-test/t/ps_grant.test:
  Fix cleanup of test

include/my_global.h:
  Auto merged
isam/create.c:
  Auto merged
merge/mrg_create.c:
  Auto merged
myisammrg/myrg_create.c:
  Auto merged
mysys/mf_tempfile.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  No change to main source when integrating 4.1.10a.
myisam/mi_create.c:
  No change to main source when integrating 4.1.10a.
scripts/mysql_create_system_tables.sh:
  No change to main source when integrating 4.1.10a.
sql/mysql_priv.h:
  No change to main source when integrating 4.1.10a.
sql/mysqld.cc:
  No change to main source when integrating 4.1.10a.
sql/share/english/errmsg.txt:
  No change to main source when integrating 4.1.10a.

- some wordings,
- RPM packaging improvements.


configure.in:
  Set the version string.
scripts/mysql_create_system_tables.sh:
  Security change: Reduce the risk caused by predefined anonymous logins.
sql/mysqld.cc:
  Correct a message text; align variable order with other versions.
sql/sql_udf.cc:
  Fix an erroneous takeover of 4.0 wording.
support-files/mysql.spec.sh:
  Fix date formatting, add missing change descriptions.

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

into mdk10.(none):/home/reggie/bk/mysql-4.1

BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Manual merge, fix already applied to 4.1

 - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Added a missing comma.

Originally contained in 2005/03/04 09:30:22+01:00 ingo@mysql.com;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


myisam/mi_create.c:
  Fix for a build bug.
  Added a missing comma.

Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/sql_udf.cc:
  after merge fixes

Originally contained in 2005/03/03 23:10:23+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/mysqld.cc:
  typos fixed

Originally contained in 2005/03/03 21:13:33+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


sql/ha_myisam.cc:
  uninit variable fixed

Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.


include/my_global.h:
  O_NOFOLLOW
isam/create.c:
  create table files with O_EXCL|O_NOFOLLOW
merge/mrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
myisam/mi_create.c:
  create files of temporary tables with O_EXCL|O_NOFOLLOW
myisammrg/myrg_create.c:
  create table files with O_EXCL|O_NOFOLLOW
mysys/mf_tempfile.c:
  create temporary files with O_EXCL|O_NOFOLLOW
sql/ha_myisam.cc:
  let mi_create know if the table is TEMPORARY
sql/mysql_priv.h:
  --allow_suspicious_udfs
sql/mysqld.cc:
  --allow_suspicious_udfs
sql/share/english/errmsg.txt:
  typo
sql/sql_udf.cc:
  --allow_suspicious_udfs
  don't allow xxx() udf without any of xxx_init/deinit/add/reset
  check paths when loading from mysql.func
sql/table.cc:
  create frm of temporary table with O_EXCL|O_NOFOLLOW

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