into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345


ndb/include/util/File.hpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged

Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj


mysql-test/t/ctype_utf8.test:
  Auto merged
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Auto merged
myisam/mi_unique.c:
  ul
  ul
  ul

ndb/src/mgmclient/CommandInterpreter.cpp:
  help information more canonical

into  dev3-127.(none):/mnt/mysql/home/ngb/bug19620


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

ndb/src/mgmclient/CommandInterpreter.cpp:
  Modify error message from "Start of backup failed" to "Backup failed" when backup is aborted
ndb/src/mgmsrv/Services.cpp:
  Append error message when error event occour
ndb/src/ndbapi/ndberror.c:
  Mofidy error message from "Backup aborted by applicaton" to "Backup aborted by user request"

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

ndb/src/mgmclient/CommandInterpreter.cpp:
  Help command has added for each command inside the ndb_mgm.

ndb/src/mgmclient/CommandInterpreter.cpp:
  Not start event thread when ndb_mgm client is running in executing (-e) mode.
ndb/src/mgmclient/main.cpp:
  Not start event thread when ndb_mgm is runing in executing (-e) mode.
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Not start event thread when ndb_mgm is running in executing (-e) mode.

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb

  
few cases not handled properly (NF occurs).


ndb/src/kernel/blocks/backup/Backup.cpp:
  Don't write fragment info if we haven't retreived any fragment info yet
  (FailMaster test 2)
      
  Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)

into  zim.(none):/home/brian/mysql/dep-5.0

mysql-test/r/mysqldump.result:
  Update results.
mysql-test/t/mysqldump.test:
  Fix a bug in the test case that left user mysqltest_1@localhost 
  around (this broke furhter tests).

into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

Fixed by moving update_key_parts() down to be after write_index().


myisam/sort.c:
  write_index() collects index statistic which is further used in
  update_key_parts(). Thus update_key_parts() must be called after
  write_index().
mysql-test/r/repair.result:
  Test case for bug#18874.
mysql-test/t/repair.test:
  Test case for bug#18874.

ndb/src/mgmsrv/ConfigInfo.cpp:
  add maximum node number judging in transformNode
ndb/src/mgmsrv/MgmtSrvr.cpp:
  if configure filename isnot null, display it

Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 


sql/field.cc:
  data_length for field needs to be calculated directly.
sql/field.h:
  The new method data_length() returns the "real" length of the field.
sql/ha_archive.cc:
  Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL.

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0


mysql-test/r/grant.result:
  Manual merge: use local.
mysql-test/t/grant.test:
  Manual merge: use local.
sql/sql_update.cc:
  Manual merge: use local.

use correct termninology


sql/ha_ndbcluster.cc:
  just replace 'number_of_storage_nodes' with 'number_of_data_nodes'

mysql-test/r/grant2.result:
  Merge update:  Change between versions, it appears.
mysql-test/r/heap_btree.result:
  Merge update:  Add deterministic ordering of data, as the order is different 
  between versions.
mysql-test/r/mysql_client.result:
  Merge update: Help options changed between versions.
mysql-test/t/heap_btree.test:
  Merge update:  Add deterministic ordering of data, as the order is different 
  between versions.
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Delete: mysql-test/t/bug20328.test
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Delete: mysql-test/r/bug20328.result

myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.


myisam/mi_unique.c:
  Fix for bug #20709: Collation not used in group by on 4.1.    
  
  myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
  TEXT and VARTTEXT key segments.
    
  Example: assume, we have a 'char(200) collate utf8_unicode_ci' field,
  there are two records with _utf8"0x65" and _utf8"0xC3A9" characters;
  these values are equal according
  to the utf8_unicode_ci collation, but two 600 byte length corresponding keys:  
  "0x65<0x20 repeats 599 times>" and "0xC3A9<0x20 repeats 598 times>" are not    
  equal if we count trailing spaces and it may cause inconsequent behavior.
  
  So, let's pass 1 as the skip_end_space parameter value to the mi_compare_text()
  function for proper TEXT and VARTTEXT key segments comparison.
mysql-test/r/ctype_utf8.result:
  Fix for bug #20709: Collation not used in group by on 4.1.    
    - test results.
mysql-test/t/ctype_utf8.test:
  Fix for bug #20709: Collation not used in group by on 4.1.    
    - test case.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
heap/hp_delete.c:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/grant2.result:
  Manual merge
mysql-test/r/heap_btree.result:
  Manual merge
mysql-test/r/mysql_client.result:
  Manual merge
mysql-test/t/grant2.test:
  Manual merge
mysql-test/t/heap_btree.test:
  Manual merge
mysql-test/t/mysql_client.test:
  Manual merge

BitKeeper/deleted/.del-bug20328.test:
  Delete: mysql-test/t/bug20328.test
BitKeeper/deleted/.del-bug20328.result:
  Delete: mysql-test/r/bug20328.result

into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-4.1

into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0


myisam/mi_update.c:
  Auto merged

Problem described in this bug report affects MyISAM tables only.

Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.

This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.


myisam/mi_update.c:
  Every myisam function that updates myisam table must end with
  call to _mi_writeinfo(). If operation (second param of
  _mi_writeinfo()) is not 0 it sets share->changed to 1, that is
  flags that data has changed. If operation is 0, this function
  equals to no-op in this case.
  
  mi_update() must always pass !0 value as operation, since even if
  there is no index change there could be data change.

ndb/src/ndbapi/ClusterMgr.cpp:
  remove extra 'ndbout << endl'

fixups after review by jonas


ndb/src/mgmclient/CommandInterpreter.cpp:
  Guard the print mutex when running SHOW
ndb/src/mgmsrv/MgmtSrvr.cpp:
  replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
  
  don't use bitmask as parameter to forceHB to reflect reality of what the
  function does.
  
  remove get_connected_ndb_nodes() as it is no longer used
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove unused get_connected_ndb_nodes()
  
  update updateStatus prototype
ndb/src/mgmsrv/Services.cpp:
  use new prototype for updateStatus() - doesn't accept NodeBitmask
ndb/src/ndbapi/ClusterMgr.cpp:
  remove global_flag_send_heartbeat_now, replace with forceHB.
  
  compute bitmask of nodes to send HB to in forceHB
ndb/src/ndbapi/ClusterMgr.hpp:
  update prototype for forceHB, don't give the illusion that NodeBitmask means much.

  After merge fix


sql/sql_view.cc:
  After merge fix

into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged