into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.1-engines


mysql-test/r/fulltext_left_join.result:
  Auto merged
mysql-test/t/fulltext_left_join.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines


sql/item_func.cc:
  Auto merged

            LEFT JOIN
Fixed that in certain situations MATCH ... AGAINST returns false hits
for NULLs produced by LEFT JOIN when there is no fulltext index
available.


mysql-test/r/fulltext_left_join.result:
  A test case for BUG#25729.
mysql-test/t/fulltext_left_join.test:
  A test case for BUG#25729.
sql/item_func.cc:
  concat_ws(NULL) returns empty string instead of NULL. There is not much
  sense to calculate relevance for empty strings, thus return 0 immediately
  if we got NULL or empty string from concat_ws.
sql/item_func.h:
  Item_func_match::concat renamed to concat_ws.

into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  SCCS merged
mysql-test/r/archive.result:
  Manually merged.
mysql-test/t/archive.test:
  Manually merged.
storage/example/ha_example.cc:
  Manually merged.

into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/ha_ndbcluster.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

            ARCHIVE table
ARCHIVE table was truncated by REPAIR TABLE ... USE_FRM statement.
The table handler returned its file name extensions in a wrong order.
REPAIR TABLE believed it has to use the meta file to create a new table
from it.

With the fixed order, REPAIR TABLE does now use the data file to create
a new table. So REPAIR TABLE ... USE_FRM works well with ARCHIVE engine
now.

This issue affects 5.0 only, since in 5.1 ARCHIVE engine stores meta
information and data in the same file.


mysql-test/r/archive.result:
  A test case for bug#26138.
mysql-test/t/archive.test:
  A test case for bug#26138.
sql/examples/ha_example.cc:
  Added a comment.
sql/ha_archive.cc:
  First element of engine file name extentions array should be meta/index
  file extention. Second element - data file extention. This is true
  for engines that have separate meta/index file and data file.
  
  Reoder ha_archive_exts elements to meet described above requirement.
sql/handler.h:
  Added a comment.
sql/sql_table.cc:
  Added a comment.

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


include/my_pthread.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
mysys/my_thr_init.c:
  Manual merge

into  chilla.local:/home/mydev/mysql-5.1-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines


mysys/my_redel.c:
  Auto merged

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster_binlog.cc:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines

- do not try to perge binlog when purge comes from slave, it never purges binlog anyways

sql/mysqld.cc:
  Fix compiler warning
sql/stacktrace.c:
  Fix compiler warning

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/ndb_single_user.result:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user

 - quick workaround, better patch is needed later
 - test case


mysql-test/r/rpl_ndb_basic.result:
  Bug #27378 update becomes delete on slave
   - test case
mysql-test/t/rpl_ndb_basic.test:
  Bug #27378 update becomes delete on slave
   - test case
sql/ha_ndbcluster.cc:
  Bug #27378 update becomes delete on slave
   - quick workaround, better patch is needed later

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged

- also run this patch on 32 bit machines to allow online upgrade

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged

- increase var part reference from 32 to 64 bits on 64 bit systems
- note current patch does not allow for online upgrade from 32 to 64 bit systems or vice versa

into  trift-lap.fambruehe:/MySQL/M51/push-5.1


client/Makefile.am:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg

  Extended test section
  Removed duplicate EXTRA_DIST


client/Makefile.am:
  Removed duplicate EXTRA_DIST
Makefile.am:
  Extended test section

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged

  Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches


configure.in:
  Don't install ndb man pages if no ndb configured
CMakeLists.txt:
  Removed Cybozu patches
include/config-win.h:
  Removed Cybozu patches
win/README:
  Removed Cybozu patches
win/configure.js:
  Removed Cybozu patches

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

mysys/my_thr_init.c:
  Enclose a variable declaration in the same '#ifdef' that also controls all access to the variable.
  This avoids warnings of "unused variable".

            losing it's .MYD

When OPTIMIZE TABLE is completed it attempts to rename temporary
file to original name. This step may fail on windows when a file
is opened. As a result data file might be deleted and optimized
copy of file (table_name.MYD) remains.

This situation is handled properly by my_delete_allow_opened, so
use it instead of my_delete when attempting to rename a file on
windows.

No suitable test case for this bug.


mysys/my_redel.c:
  Attempting to delete an opened file and to immediately create
  a new one with the same name may result in my_redel failure on
  windows. It may fail because file is not deleted until it is
  closed.
  
  This situation is handled properly by my_delete_allow_opened, so
  use it instead of my_delete.