into mc05.(none):/space/tomas/mysql-4.1-ndb

into mysql.com:/home/mysqldev/tulin/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mc05.(none):/space/tomas/mysql-4.1-ndb

into mc05.(none):/space/tomas/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1

configure.in:
  configure to check if HAVE_COMPRESS for ndbcluster table handler
ndb/Makefile:
  fix for problems with parallell make
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed ifdef _BIG_ENDIAN => WORDS_BIGENDIAN
ndb/src/ndbapi/Ndb.cpp:
  changed ifdef _BIG_ENDIAN => WORDS_BIGENDIAN

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


client/mysql.cc:
  Auto merged

Fixed wrong number of warnings/duplicates for machines with high-byte-first


client/mysql.cc:
  Remove not used variables
client/mysqltest.c:
  Remove double ;
myisam/ft_nlq_search.c:
  Fix valgrind error (not fatal)
myisam/rt_test.c:
  Portability fix
mysql-test/r/rpl_trunc_binlog.result:
  Portability fix
mysql-test/t/rpl_trunc_binlog.test:
  Portability fix
  (Column 23 was different on openbsd)
sql/sql_insert.cc:
  Fixed wrong number of warnings/duplicates for machines with high-byte-first
strings/ctype-big5.c:
  Portability fix
strings/ctype-gbk.c:
  Portability fix
strings/ctype-mb.c:
  Portability fix
strings/ctype-uca.c:
  Portability fix
tests/client_test.c:
  Portability fixes

into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1

Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated). 


sql/examples/ha_example.h:
  Updating ha_example.h for new records_in_range. ha_example.cc has already been updated.

into mysql.com:/Users/mikron/patch_cluster


BitKeeper/etc/logging_ok:
  auto-union

files, such as ha_ndbcluster.cc

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mc05.(none):/space/tomas/mysql-4.1-ndb

innobase/ut/ut0ut.c:
  Remove unused function ut_printf()

into hundin.mysql.fi:/home/marko/j/mysql-4.1

innobase/dict/dict0dict.c:
  Replace char* arguments with const char*
innobase/dict/dict0load.c:
  Replace char* arguments with const char*
innobase/dict/dict0mem.c:
  Replace char* arguments with const char*
innobase/fil/fil0fil.c:
  Replace char* arguments with const char*
innobase/include/data0data.h:
  dfield_set_data(): add const qualifier
innobase/include/data0data.ic:
  dfield_set_data(): add const qualifier
  (temporarily shut up compiler warnings)
innobase/include/dict0dict.h:
  Replace char* arguments with const char*
innobase/include/dict0dict.ic:
  Replace char* arguments with const char*
innobase/include/dict0load.h:
  Replace char* arguments with const char*
innobase/include/dict0mem.h:
  Replace char* arguments with const char*
innobase/include/fil0fil.h:
  Replace char* arguments with const char*
innobase/include/os0file.h:
  Replace char* arguments with const char*
innobase/include/os0sync.h:
  Replace char* arguments with const char*
innobase/include/pars0pars.h:
  Replace char* arguments with const char*
innobase/include/pars0sym.h:
  Replace char* arguments with const char*
innobase/include/row0mysql.h:
  Replace char* arguments with const char*
innobase/include/row0sel.h:
  Replace char* arguments with const char*
innobase/include/trx0roll.h:
  Replace char* arguments with const char*
innobase/include/trx0sys.h:
  Replace char* arguments with const char*
innobase/include/trx0trx.h:
  Replace char* arguments with const char*
innobase/include/ut0rnd.h:
  Replace char* arguments with const char*
innobase/include/ut0rnd.ic:
  Replace char* arguments with const char*
innobase/include/ut0ut.h:
  Remove unused function ut_printf()
innobase/os/os0file.c:
  Replace char* arguments with const char*
innobase/os/os0sync.c:
  Replace char* arguments with const char*
innobase/pars/pars0pars.c:
  Replace char* arguments with const char*
innobase/pars/pars0sym.c:
  Use mem_heap_strdupl() instead of mem_heap_alloc() and memcpy()
innobase/row/row0mysql.c:
  Replace char* arguments with const char*
innobase/row/row0sel.c:
  Replace char* arguments with const char*
innobase/trx/trx0roll.c:
  Replace char* arguments with const char*
innobase/trx/trx0sys.c:
  Replace char* arguments with const char*

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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

check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later


mysql-test/r/order_by.result:
  bug#3681 - order by, distinct, refer to aliased field by name

mysql-test/r/type_float.result:
  Fix result after merge
sql/log_event.cc:
  Fixed typo

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/eval/eval0eval.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
innobase/os/os0file.c:
  Merge with 4.0.20
  Ensure that we call F_UNLCK for files on which we call F_WRLCK.
  This is to ensure that this code will be portable accross most platforms.
myisam/ft_boolean_search.c:
  Merge with 4.0.20 (keep original file)
myisam/ft_parser.c:
  Merge with 4.0.20 (keep original file)
myisam/ftdefs.h:
  Merge with 4.0.20 (keep original file)

into mishka.local:/home/my/mysql-4.1


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

New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys




heap/hp_hash.c:
  New records_in_range() interface
include/heap.h:
  New records_in_range() interface
include/my_base.h:
  Moved 'key_range' here so that all table handlers can use it
include/my_bitmap.h:
  Make some bitmap functions inline for faster usage in one thread
include/myisam.h:
  New records_in_range() interface
include/myisammrg.h:
  New records_in_range() interface
myisam/mi_range.c:
  New records_in_range() interface
myisam/mi_test2.c:
  New records_in_range() interface
myisam/rt_test.c:
  New records_in_range() interface
  Indentation fixes
myisam/sp_test.c:
  New records_in_range() interface
  Indentation fixes
myisammrg/myrg_range.c:
  New records_in_range() interface
mysys/my_bitmap.c:
  Make some bitmap functions inline for faster usage in one thread
sql/examples/ha_example.cc:
  New records_in_range() interface
sql/field.cc:
  Fixed indentation
sql/ha_berkeley.cc:
  New records_in_range() interface
sql/ha_berkeley.h:
  New records_in_range() interface
sql/ha_heap.cc:
  New records_in_range() interface
sql/ha_heap.h:
  New records_in_range() interface
sql/ha_innodb.cc:
  New records_in_range() interface
sql/ha_innodb.h:
  New records_in_range() interface
sql/ha_isam.cc:
  New records_in_range() interface
sql/ha_isam.h:
  New records_in_range() interface
sql/ha_myisam.cc:
  New records_in_range() interface
sql/ha_myisam.h:
  New records_in_range() interface
sql/ha_myisammrg.cc:
  New records_in_range() interface
sql/ha_myisammrg.h:
  New records_in_range() interface
sql/ha_ndbcluster.cc:
  New records_in_range() interface
sql/ha_ndbcluster.h:
  New records_in_range() interface
sql/handler.cc:
  Simplify read_range() interface:
  - Add 'eq_range' to read_range_first
  - Remove 'eq_range' parameer from read_range_next()
  - Trust values from index_next_same()
  - Simplfy compare_key() by moving key_comparision to key.cc (as this code can be reused from other places)
sql/handler.h:
  Move key_range to my_base.h to be used by external table handlers
  Simplify read_range() interface
  New records_in_range() interface
sql/key.cc:
  Rename key_cmp() to key_cmp_if_same() to make it more descriptive
  Add new key_cmp() function usable from range and handler code.
sql/mysql_priv.h:
  Prototypes for new functions
sql/opt_range.cc:
  New records_in_range() interface
  Simplify cmp_prev()
  (We can in 5.0 simplify cmp_next() the same way)
sql/opt_range.h:
  Added key_part_info to QUICK_SELECT to be able to use key_cmp() in get_next()
sql/opt_sum.cc:
  key_cmp -> key_cmp_if_same
sql/sql_acl.cc:
  key_cmp -> key_cmp_if_same
sql/sql_select.cc:
  key_cmp -> key_cmp_if_same

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged

mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/order_by.result:
  buggy results bug#3681
mysql-test/t/order_by.test:
  test for bug#3681

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


mysql-test/r/func_encrypt.result:
  Auto merged

mysql-test/r/func_encrypt.result:
  Update tests (left after sanjas last push)
mysql-test/r/innodb.result:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
mysql-test/t/innodb.test:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
sql/sql_class.cc:
  Updated comment
tests/client_test.c:
  Added missing mysql_stmt_close()

mysql-test/r/func_encrypt.result:
  right SELECT print
mysql-test/r/func_gconcat.result:
  make results stable
mysql-test/t/func_gconcat.test:
  make results stable

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1