into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut

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


client/mysql.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut

errormsg.sys)
Cleanups added


client/mysql.cc:
  my_end(0) added to do all the necessary cleanups
  glob_buffer.realloc() moved beneath the mysql_server_init

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

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

ndb/src/kernel/ndb-main/Main.cpp:
  Only install signalhandlers up to SIGRTMIN
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/item.cc:
  assigning max_length/decimal parameter for Item_param
tests/client_test.c:
  layout fixed
  test suite for bug

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728

innobase/include/ut0ut.h:
  Remove unused functions ut_sprintf() and ut_fprintf()
innobase/ut/ut0ut.c:
  Remove unused functions ut_sprintf() and ut_fprintf()

sql/sql_union.cc:
  describe should go until the end

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


mysql-test/r/func_encrypt.result:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

mysql-test/r/derived.result:
  explain of hidden subselect changed according to review
mysql-test/r/subselect.result:
  explain of hidden subselect changed according to review
mysql-test/r/union.result:
  explain of hidden subselect changed according to review
sql/sql_class.h:
  we bo not need sign for now
sql/sql_lex.h:
  we do not need sign for now

rpl_relayrotate.test to innodb.test since this test requires innodb support.


mysql-test/t/innodb-master.opt:
  Rename: mysql-test/t/rpl_relayrotate-master.opt -> mysql-test/t/innodb-master.opt

Made the combination of INTO and FROM DUAL work, e.g.
SELECT 1 INTO @x FROM DUAL.
As a consequence, DUAL is made a reserved word. It would work to not have
it reserved, but it was deemed to be confusing as a user defined table by
the same name then must be qualified with a db (schema).


sql/sql_yacc.yy:
  Made the combination of INTO and FROM DUAL work, e.g.
  SELECT 1 INTO @x FROM DUAL.
  As a consequence, DUAL is made a reserved word. It would work to not have
  it reserved, but it was deemed to be confusing as a user defined table by
  the same name then must be qualified with a db (schema).

into deer.(none):/home/hf/work/mysql-4.1.ps


sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged

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.

files, such as ha_ndbcluster.cc

using of methods like sint2korr() doesn't work on Bigendian machines


sql/sql_prepare.cc:
  special 'embedded' patches added to almost all set_parameter_XXX functions

into deer.(none):/home/hf/work/mysql-4.1.ps


sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged

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

errmsg.sys)


client/mysql.cc:
  Checking of mysql_server_init output added

missing)


libmysqld/embedded_priv.h:
  embedded_get_error interface added
libmysqld/lib_sql.cc:
  embedded_get_error implementation/using added
libmysqld/libmysqld.c:
  embedded_get_error call added

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