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


storage/myisam/mi_delete.c:
  Auto merged

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


myisam/mi_delete.c:
  Auto merged

into  chilla.local:/home/mydev/mysql-4.1-bug22384


myisam/mi_delete.c:
  Auto merged

Deletes on a big index could crash the index when it needs to
shrink.

Put a forgotten negation operator in.

No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.


myisam/mi_delete.c:
  Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
  Put a negation operator ('!') before _mi_get_last_key() in del().
  It returns NULL on error, non-NULL on success.

  "plugin name lost when loading an already-loaded name"
  Do not delete existing plugin when loading a new plugin which has the
  same name.


sql/sql_plugin.cc:
  Bug#20615
    Don't delete the plugin if it wasn't added.

  "Loaded engine does not load after restart."
  Junk characters caused plugin load to fail silently.


sql/sql_plugin.cc:
  junk characters cause plugin load to fail.
  eliminate use of strlen().

into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Merge of after merge fix
mysql-test/r/myisam.result:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Merge of after merge fix
mysql-test/t/myisam.test:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Merge of after merge fix

            "concurrent insert"
After merge fix.

into  chilla.local:/home/mydev/mysql-4.0-bug14400


mysql-test/r/myisam.result:
  Auto merged
myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Manual merge
mysql-test/t/myisam.test:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Manual merge

into  chilla.local:/home/mydev/mysql-4.0-bug14400


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of
              "concurrent insert"
  Manual merge

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


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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

into  xiphis.org:/home/antony/work2/p2-bug22417.2

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


mysql-test/t/disabled.def:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge from 5.1-engines.

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_test_all.res:
  Auto merged
storage/myisam/mi_test_all.sh:
  Merge from 5.0.

into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
myisam/mi_test_all.res:
  Manual merge from 4.1.
sql/sql_select.cc:
  Manual merge from 4.1.

into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
myisam/mi_rkey.c:
  Manual null merge as a better fix is already present.
mysql-test/r/myisam.result:
  Manual null merge as a better fix is already present.
mysql-test/t/myisam.test:
  Manual null merge as a better fix is already present.
sql/sql_select.cc:
  Manual merge of purify improvements.

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


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

  "plug.in not included in dist source"


storage/archive/Makefile.am:
  plug.in needs to be included in dist
storage/blackhole/Makefile.am:
  plug.in needs to be included in dist
storage/csv/Makefile.am:
  plug.in needs to be included in dist
storage/example/Makefile.am:
  plug.in needs to be included in dist
storage/federated/Makefile.am:
  plug.in needs to be included in dist
storage/heap/Makefile.am:
  plug.in needs to be included in dist
storage/innobase/Makefile.am:
  plug.in needs to be included in dist
storage/myisam/Makefile.am:
  plug.in needs to be included in dist
storage/myisammrg/Makefile.am:
  plug.in needs to be included in dist
storage/ndb/Makefile.am:
  plug.in needs to be included in dist

BitKeeper/deleted/.del-strict_autoinc_4bdb.test:
  Delete: mysql-test/t/strict_autoinc_4bdb.test
mysql-test/r/strict_autoinc_1myisam.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_2innodb.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_3heap.result:
  post merge fixes, error message was changed
mysql-test/r/strict_autoinc_5ndb.result:
  post merge fixes, error message was changed

into  xiphis.org:/home/antony/work2/engines-merge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
include/my_base.h:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/handler.cc:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
storage/innobase/handler/ha_innodb.cc:
  manual merge

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


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines

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


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

fixed when 5.1-win will be pushed into main tree).
Commenting the libmysqld and libmysqld/example subdirectories will allow us 
to upgrade from cmake 2.2 to 2.4.


CMakeLists.txt:
  comment libmysqld and libmysqld/example directories

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged

2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper


mysql-test/include/mix1.inc:
  - Remove hardcoded assignment of storage engine, because this violates the logics of
    refactored tests
  - Remove trailing spaces
  - Move the FOREIGN KEY creation(probably not really needed for the testcase) out of 
    the CREATE TABLE statement + let the FK creation depend on the storage engine capabilities
mysql-test/r/index_merge_innodb.result:
  Updated result
mysql-test/r/index_merge_myisam.result:
  Updated result
mysql-test/r/innodb_mysql.result:
  Updated result
mysql-test/t/disabled.def:
  Reenable the fixed tests
mysql-test/t/index_merge_innodb.test:
  Important comment describing how to modify the tests when some issues
  (most probably no bugs) are fixed.
mysql-test/t/innodb_mysql.test:
  Introduction of a variable for switching FOREIGN KEY on/off

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines


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

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/row.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/sp.test:
  SCCS merged
sql/item_cmpfunc.cc:
  SCCS merged
sql/sql_select.cc:
  SCCS merged