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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

latin5.xml:
  - Fixing order thee Turkish letters to conform Turkish rules.
  - All non-Turkish accented letters are mappend
    to their non-accented counterparts.


sql/share/charsets/latin5.xml:
  Bug#13421 problem with sorting turkish
  Fixing order to conform the Turkish rules.
  All non-Turkish accented letters are mappend to
  the non-accented counterparts.

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

   - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
    Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
etc will use 'ascii'
    - Comitting again, the old patch seems to have been lost.


mysql-test/r/func_misc.result:
  Test results updated
mysql-test/t/func_misc.test:
  Test case
sql/item_strfunc.h:
  Multiply max_length of Item_func_uuid with system_charset_info->mbmaxlen

It will copy from each node the logs and trace dumps (if any) and create
a tarball. Having this tarball attached to a bug report greatly helps
troubleshooting and avoids user error.

It will (optionally) also get the filesystem.


ndb/tools/ndb_error_reporter:
  New BitKeeper file ``ndb/tools/ndb_error_reporter''

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


BitKeeper/triggers/post-commit:
  Auto merged

   internals@lists.mysql.com to reduce the noise on the internals list.

(Backport of an identical change from 5.0)


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
  and the one already installed on the system for the "max" build which is also labeled "experimental".
  (Backport of an identical change from 5.0)

scripts/make_binary_distribution.sh:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.

client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.

into moonbone.local:/work/15028-bug-4.1-mysql

ndb/src/kernel/blocks/backup/Backup.cpp:
  If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
  all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
  error in FSAPPENDCONF is hit.
  
  This would mean that no error code was set for the backup and that it would
  be incomplete as not all IO had been written to disk before the node crash.
  This would not be reported to the user.
  
  So the backup would appear to succeed but it really didn't.
  
  The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.


sql/sql_update.cc:
  Fix bug#15028  Multitable update returns different numbers of matched rows
  depending on table order
  multi_update::send_data() now counts only unique rows.
mysql-test/t/update.test:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
mysql-test/r/update.result:
  Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order

  convert comment to english


ndb/src/kernel/blocks/backup/Backup.cpp:
  convert comment to english

to be in the query cache. (BUG#14652)


mysql-test/r/query_cache.result:
  BUG#14652 test suite.
mysql-test/t/query_cache.test:
  BUG#14652 test suite.
sql/sql_cache.cc:
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache.

  Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.

Makes it easier to grep for senders of signals to specific blocks


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.

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


sql/item.cc:
  Auto merged

  fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error

  fix incorrect quoting of column name


ndb/tools/ndb_size.pl:
  fix incorrect quoting of column name

Goup is not needed to run cluster


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  s/ownNodeGoup/ownNodeGroup/

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

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

  added SSL_library_init()

  management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.

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


sql/item.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-4.1

sql/log_event.cc:
  Add missing cast needed for Win32 compilation.
include/config-win.h:
  Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.

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

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

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

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

CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.


mysql-test/r/ps.result:
  Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
  A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
  TABLE and PS/SP"
sql/mysql_priv.h:
  typelib() function declaration has been changed.
sql/sql_table.cc:
  Supply the statement memory root to use in typelib() and
  safe_charset_converter() functions to ensure that objects 
  created during the first execution of CREATE TABLE statement
  are allocated in persistent memory of the statement.
sql/table.cc:
  Change typelib() function to require MEM_ROOT.

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

into moonbone.local:/work/14482-bug-4.1-mysql