into avenger.(none):/export/brian/mysql/test/5.0


client/mysqldump.c:
  Auto merged
myisam/mi_check.c:
  Auto merged

into avenger.(none):/export/brian/mysql/test/5.0


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

client/mysqlbinlog.cc:
  Resolveing merge
client/mysqldump.c:
  resolving merge
sql/handler.cc:
  resolving merge
sql/lex.h:
  resolve merge
sql/log.cc:
  resolving merge
sql/log_event.cc:
  resolving merge
sql/sql_parse.cc:
  resolving merge
sql/sql_yacc.yy:
  resolving merge

BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Reorder options, revise --hex-blob help string.


client/mysqldump.c:
  Reorder options, revise --hex-blob help string.

sql/sql_prepare.cc:
  send_prepare_results -> check_prepared_statement

myisam/mi_check.c:
  one more correctness check for CHECK of fulltext indexes

check_simple_select). This change was inspired by Monty in December 2003
when thd->lex became a pointer in 4.1.


sql/sql_parse.cc:
  Few more places with thd->lex replaced with lex.
sql/sql_update.cc:
  Few more places with thd->lex replaced with lex.

  Remove duplicated innodb max purge lag code


innobase/trx/trx0purge.c:
  Remove duplicated innodb max purge lag code

sql/sql_delete.cc:
  Cleanup: thd->lex->select_lex -> select_lex

sql/sql_acl.cc:
  Cleanup: we want to synonim thd->lex on stack, as we use it often in
  replace_user_table.

sql/filesort.cc:
  val -> val_real
sql/item.cc:
  val -> val_real
sql/item.h:
  val -> val_real
sql/item_buff.cc:
  val -> val_real
sql/item_cmpfunc.cc:
  val -> val_real
sql/item_cmpfunc.h:
  val -> val_real
sql/item_func.cc:
  val -> val_real
sql/item_func.h:
  val -> val_real
sql/item_geofunc.cc:
  val -> val_real
sql/item_geofunc.h:
  val -> val_real
sql/item_row.h:
  val -> val_real
sql/item_strfunc.cc:
  val -> val_real
sql/item_strfunc.h:
  val -> val_real
sql/item_subselect.cc:
  val -> val_real
sql/item_subselect.h:
  val -> val_real
sql/item_sum.cc:
  val -> val_real
sql/item_sum.h:
  val -> val_real
sql/item_timefunc.h:
  val -> val_real
sql/item_uniq.h:
  val -> val_real
sql/procedure.h:
  val -> val_real
sql/sp_head.cc:
  val -> val_real
sql/sql_analyse.cc:
  val -> val_real
sql/sql_class.cc:
  val -> val_real
sql/sql_select.cc:
  val -> val_real

sql/item.cc:
  post-merge fixes
sql/sql_select.cc:
  post-merge fixes

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug6469


sql/sql_yacc.yy:
  Auto merged

  better printouts in ndb_test_platform


ndb/tools/ndb_test_platform.cpp:
  better printouts in ndb_test_platform

  fixed so that connectring option works


ndb/tools/waiter.cpp:
  fixed so that connectring option works

into mysql.com:/home/timka/mysql/src/5.0-1972


sql/sql_base.cc:
  Auto merged

  made sleep time for second master larger so that it has time to start


mysql-test/mysql-test-run.sh:
  made sleep time for second master larger so that it has time to start

sql/sql_base.cc:
  Fixing filename case problems for views on MacOS X. (With help from sanja :)

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/M50/mysql-5.0

    removed some errorcodes not used


ndb/src/mgmclient/CommandInterpreter.cpp:
  forgot a return 0
ndb/src/ndbapi/ndberror.c:
  removed some errorcodes not used

client/mysqltest.c:
  Syntax error: Removed the trailing comma after last element of an "enum" list.

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/r/lowercase_table2.result:
  Updated results. (show tables output has changed)

fixed

  fixed typo


mysql-test/ndb/ndbcluster.sh:
  fixed typo

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

sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/item.cc:
  manual merge
sql/sql_select.cc:
  manul merge

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/sql_yacc.yy:
  Auto merged

sql/sql_yacc.yy:
  forgotten ';' (bison 1.875 accepts if it's not there, but 1.75 does not)

sql/item.cc:
  manual merge with latest bk source tree

sql/sql_select.cc:
  manual merge with latest bk source

  Handle some additional Texinfo tags that were being missed.


scripts/fill_help_tables.sh:
  Handle some additional Texinfo tags that were being missed.

into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/handler.cc:
  Auto merged