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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Auto merged

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

mysql-test/r/cast.result:
  test result fixed

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into mysql.com:/home/my/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

  has branched off from the 4.1 tree to build the 5.0.4 release

into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

 - Removed hardcoded error message from 4.1


include/my_base.h:
  Adding error message for the case when table definition has changed in storage engine
mysql-test/t/ndb_alter_table.test:
  Updated testresult to expect new error code
sql/ha_ndbcluster.cc:
  Add mapping for ndb error 284 to HA_ERR_TABLE_DEF_CHANGED, this error will occur when the table definition has been changed by another MySQL Server connected to the cluster.
  Remove hardcoded errormessage from 4.1
sql/handler.cc:
  Adding error message for the case when table definition has changed in storage engine
sql/share/errmsg.txt:
  Adding error message for the case when table definition has changed in storage engine

sql/ha_ndbcluster.cc:
  SCCS merged

into mysql.com:/home/my/mysql-5.0


sql/sql_select.cc:
  Auto merged

Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files


BitKeeper/etc/ignore:
  added tools/mysqltestmanager
client/mysqltest.c:
  Ensure that BIG_TEST is always set to 0 or 1
  Fix the 'eval' also honors 'require'
mysql-test/mysql-test-run.sh:
  Enlarge InnoDB table space for --big tests
mysql-test/r/heap.result:
  Fix after adding more optimzation for filsort
mysql-test/r/sum_distinct.result:
  Move 'slow' part of test to sum_distinct-big.test
mysql-test/t/heap.test:
  Ensure that results are indpendent of optimizer
mysql-test/t/sum_distinct.test:
  Move 'slow' part of test to sum_distinct-big.test
sql/filesort.cc:
  Use 'sort with data' also on temporary files and with INSERT ... SELECT
sql/ha_innodb.h:
  Remove HA_FAST_KEY_READ to enable buffered-record-reads after filesort
sql/handler.h:
  More comments
sql/mysql_priv.h:
  A bit smaller limit for cache for buffered-records-read (after testing)
sql/records.cc:
  Don't use buffered-record-reads if ref_length > MAX_REFLENGTH
  Fixed warning from valgrind in 'sum_distinct'
sql/sql_select.cc:
  Ensure that tempory tables has query_id set for all fields
  (Required for sort-with-data to work on temp files)

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

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into mysql.com:/home/psergey/mysql-5.0-bug8877-merge


sql/sql_select.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-4.1-bug8877


sql/sql_select.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug8877-merge


sql/sql_select.cc:
  Auto merged

into msdesk.mysql.com:/home/magnus/mysql-5.0

into msdesk.mysql.com:/home/magnus/mysql-5.0

 - See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
  or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/


configure.in:
  The libsupc++ library on freebsd with gcc 3.4.2 is dependent on libstdc++, disable it  since other solution works fine

  After merge fix.


strings/ctype-eucjpms.c:
  After merge fix.

state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.


mysql-test/r/sp-error.result:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/r/sp.result:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/t/sp-error.test:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.
mysql-test/t/sp.test:
  Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state" to sp-error.test.

into mysql.com:/home/dlenev/src/mysql-5.0-bg9566

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


client/mysqlcheck.c:
  Auto merged

illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).


mysql-test/r/sp.result:
  Added test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state"
mysql-test/t/sp.test:
  Added test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal
  state"
sql/sp.cc:
  db_find_routine_aux():
    We should not assume that mysql.proc table does not exist if we are
    unable to open it under LOCK TABLES or in prelocked mode since this
    condition may be transient.

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

mysql-test/r/user_var.result:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
mysql-test/t/user_var.test:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied

Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually


BitKeeper/etc/logging_ok:
  auto-union
include/m_ctype.h:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/include/btr0pcur.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  ul
ndb/include/ndbapi/NdbScanOperation.hpp:
  ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
  ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
  ul
ndb/src/ndbapi/NdbScanOperation.cpp:
  ul
sql/field.cc:
  manually merged, because bk messed it up
sql/sql_yacc.yy:
  merged