into  mysql.com.:/data/BK/mysql-5.0

into  mysql.com.:/data/BK/mysql-5.0_8461_b

  fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.


sql/item_func.cc:
  fix for bug#8461
  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: TRUNCATE converts INTEGERS to DOUBLE and back to INTEGERS
  Both ROUND and TRUNCATE are affected by this.
  Changed the integer routine to work on integers only.
  This bug affects 4.1 5,0 and 5
  Fixing in 4.1 will need to change the routine to handle different types individually.

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


mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.
sql/item_func.h:
  Manual merge.
sql/sql_base.cc:
  Manual merge: use local.

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

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/item_func.h:
  Auto merged

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

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


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

Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.


mysql-test/r/group_min_max.result:
  Added a test case for bug #16203.
mysql-test/t/group_min_max.test:
  Added a test case for bug #16203.

into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0


mysql-test/t/sp-destruct.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/sp-code.result:
  Updated result after merge (BUG#16568)

into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

ndb/test/ndbapi/testBlobs.cpp:
  more tx per Ndb

into  mysql.com:/space/pekka/ndb/version/my50

ndb/test/ndbapi/testBlobs.cpp:
  do batched deletes + list commit across open cursor test cases
ndb/tools/delete_all.cpp:
  if blobs, no commit across open cursor (single trans)
  cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)

into  mysql.com:/space/pekka/ndb/version/my50


mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  ul

mysql-test/r/ndb_blob.result:
  replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
  replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
  replace+tinyblob back-patch from 5.0

mysql-test/r/ndb_blob.result:
  do not delete unknown parts of tinyblob
mysql-test/t/ndb_blob.test:
  do not delete unknown parts of tinyblob
ndb/src/ndbapi/NdbBlob.cpp:
  do not delete unknown parts of tinyblob

Fixed that fulltext query + union results in unexpected behaviour.


sql/item_func.h:
  Remove access to table object from cleanup() as the table object
  may have been dropped earlier (In case of temporary tables or of
  close_thread_tables() is run before cleanup())
  This fixed a bug with access to already freed memory
sql/sql_base.cc:
  Reset variables used by fulltext

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/t/having.test:
  Auto merged
mysql-test/r/having.result:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_lex.h:
  Manual merge
sql/sql_prepare.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge

into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into  rurik.mysql.com:/home/igor/mysql-5.0

mysql-test/r/heap.result:
  It turns out that I didn't commit one test result (it's identical 
  to 4.1)

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/sql_select.cc:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

  manual adding the fix for bug#15828 which did not automerge


sql/item_timefunc.cc:
  manual adding the fix for bug#15828 which did not automerge

into  mysql.com.:/data/BK/mysql-5.0_15828


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
  step one using local for file item_timefunc

into  mysql.com:/opt/local/work/mysql-5.0-root


BitKeeper/deleted/.del-rpl_ignore_table.result:
  Delete: mysql-test/r/rpl_ignore_table.result
BitKeeper/deleted/.del-rpl_multi_update4.result:
  Delete: mysql-test/r/rpl_multi_update4.result
BitKeeper/deleted/.del-rpl_ignore_table-slave.opt:
  Delete: mysql-test/t/rpl_ignore_table-slave.opt
BitKeeper/deleted/.del-rpl_ignore_table.test:
  Delete: mysql-test/t/rpl_ignore_table.test
BitKeeper/deleted/.del-rpl_multi_update4-slave.opt:
  Delete: mysql-test/t/rpl_multi_update4-slave.opt
BitKeeper/deleted/.del-disabled.def:
  Auto merged
BitKeeper/deleted/.del-rpl_multi_update4.test:
  Delete: mysql-test/t/rpl_multi_update4.test
heap/hp_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
configure.in:
  Manual merge.
libmysql/libmysql.c:
  Manual merge.
mysql-test/r/heap.result:
  Manual merge.
mysql-test/r/heap_hash.result:
  Manual merge.
mysql-test/r/kill.result:
  Manual merge.
sql/ha_heap.cc:
  Manual merge.
sql/ha_heap.h:
  Manual merge.
sql/item_timefunc.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

(No change of functionality)


sql/sp.cc:
  Simplified code in sp_routine_exists_in_table().

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


client/mysqltest.c:
  Auto merged