mysql-test/t/fulltext2.test:
  fixed

include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

myisam/ftdefs.h:
  intermediate cleanup checkin
myisam/mi_create.c:
  intermediate cleanup checkin
myisam/myisamchk.c:
  intermediate cleanup checkin
myisam/ft_parser.c:
  intermediate cleanup checkin
myisam/ft_update.c:
  intermediate cleanup checkin
myisam/mi_update.c:
  intermediate cleanup checkin
mysql-test/r/fulltext.result:
  stopword test
mysql-test/t/fulltext.test:
  stopword test
mysys/mulalloc.c:
  function comments clarified
include/my_handler.h:
  get_key_length_rdonly utility macro
include/myisam.h:
  this kind of hacks bites :)
myisam/ft_dump.c:
  bugfix
myisam/mi_open.c:
  bugfix
myisam/sort.c:
  bugfixing
myisam/mi_rnext.c:
  not a solution at all, but a temporary fix to make
  mi_rnext to work on ft2 index. (only ft_dump uses mi_rnext
  on fulltext indexes for now).
myisam/ft_boolean_search.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_nlq_search.c:
  ft_sintXkorr, ft_intXstore
myisam/fulltext.h:
  ft_sintXkorr, ft_intXstore
myisam/mi_check.c:
  ft_sintXkorr, ft_intXstore
myisam/ft_static.c:
  two-level tree support in wi_write()
myisam/mi_write.c:
  two-level tree support in wi_write()
myisam/myisamdef.h:
  two-level tree support in wi_write()
myisam/mi_delete.c:
  support for ft2 in mi_delete
mysql-test/r/fulltext2.result:
  support for ft2 in mi_delete
mysql-test/t/fulltext2.test:
  support for ft2 in mi_delete

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


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_derived.cc:
  resolve fix.

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


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of cardinality error
mysql-test/t/subselect.test:
  test of cardinality error

sql/mysqld.cc:
  removing debugging stuff
sql/sql_derived.cc:
  fix removed

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1


sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

sql/sql_derived.cc:
  I think it's better not to implement another "*any*"

into myvenu.com:/home/venu/bk/src-4.1


sql/sql_parse.cc:
  Auto merged

  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1


sql/ha_innodb.cc:
  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/libmysqld.c:
  conflicts resolving

embedded-related changes


include/mysql_com.h:
  net_flush emptification
libmysqld/lib_sql.cc:
  Some Protocol:: methods implemented
sql/convert.cc:
  changes to use convert in embedded library
sql/field.cc:
  set_key_image changed
sql/item.cc:
  obsolete functions removed
sql/item.h:
  embedded-related changes in Protocol class
sql/log.cc:
  there's no ports in embedded library
sql/mysqld.cc:
  some debug stuff
sql/protocol.cc:
  embedded-related changes
sql/protocol.h:
  embedded-related changes
sql/sql_cache.cc:
  comment added
sql/sql_class.cc:
  no need to do special embedded select_send::send_row
sql/sql_class.h:
  embedded-related changes
sql/sql_parse.cc:
  comments added debugging stuff deleted
sql/sql_show.cc:
  non-protocol sending removed

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

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/log_event.cc:
  merge with 4.0
sql/sql_db.cc:
  merge with 4.0 (use local)

cmd-line-utils/libedit/chared.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/common.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/el.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/emacs.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/fgetln.c:
  Removed RCSID to get rid of compiler warnings
  Removed compiler warning
cmd-line-utils/libedit/hist.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/history.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/key.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/map.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/parse.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/prompt.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/read.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/readline.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/refresh.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/search.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/sig.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/term.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tokenizer.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/tty.c:
  Removed RCSID to get rid of compiler warnings
cmd-line-utils/libedit/vi.c:
  Removed RCSID to get rid of compiler warnings
mysys/Makefile.am:
  Remove library dependency for charset2html to get correct makefile
tests/client_test.c:
  Indentation change

This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

into myvenu.com:/home/venu/work/sql/dev-4.1

into myvenu.com:/home/venu/bk/src-4.1


libmysql/libmysql.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

client/insert_test.c:
  Fixed core dump in test

BitKeeper/etc/ignore:
  added cmd-line-utils/libedit/common.h
mysys/queues.c:
  Added comments
sql/sql_parse.cc:
  Simple code cleanup
tests/grant.res:
  Updated results for 4.1

sql/sql_table.cc:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.control

into eagle.mysql.r18.ru:/home/vva/work/add_libedit/experiment/4.1.clone

cmd-line-utils/readline/.cvsignore:
  mvdir
cmd-line-utils/readline/COPYING:
  mvdir
cmd-line-utils/readline/INSTALL:
  mvdir
cmd-line-utils/readline/Makefile.am:
  mvdir
cmd-line-utils/readline/README:
  mvdir
cmd-line-utils/readline/ansi_stdlib.h:
  mvdir
cmd-line-utils/readline/bind.c:
  mvdir
cmd-line-utils/readline/callback.c:
  mvdir
cmd-line-utils/readline/chardefs.h:
  mvdir
cmd-line-utils/readline/complete.c:
  mvdir
cmd-line-utils/readline/configure.in:
  mvdir
cmd-line-utils/readline/display.c:
  mvdir
cmd-line-utils/readline/emacs_keymap.c:
  mvdir
cmd-line-utils/readline/funmap.c:
  mvdir
cmd-line-utils/readline/histexpand.c:
  mvdir
cmd-line-utils/readline/histfile.c:
  mvdir
cmd-line-utils/readline/histlib.h:
  mvdir
cmd-line-utils/readline/history.c:
  mvdir
cmd-line-utils/readline/history.h:
  mvdir
cmd-line-utils/readline/histsearch.c:
  mvdir
cmd-line-utils/readline/input.c:
  mvdir
cmd-line-utils/readline/isearch.c:
  mvdir
cmd-line-utils/readline/keymaps.c:
  mvdir
cmd-line-utils/readline/keymaps.h:
  mvdir
cmd-line-utils/readline/kill.c:
  mvdir
cmd-line-utils/readline/macro.c:
  mvdir
cmd-line-utils/readline/mbutil.c:
  mvdir
cmd-line-utils/readline/misc.c:
  mvdir
cmd-line-utils/readline/nls.c:
  mvdir
cmd-line-utils/readline/parens.c:
  mvdir
cmd-line-utils/readline/posixdir.h:
  mvdir
cmd-line-utils/readline/posixjmp.h:
  mvdir
cmd-line-utils/readline/posixstat.h:
  mvdir
cmd-line-utils/readline/readline.c:
  mvdir
cmd-line-utils/readline/readline.h:
  mvdir
cmd-line-utils/readline/rlconf.h:
  mvdir
cmd-line-utils/readline/rldefs.h:
  mvdir
cmd-line-utils/readline/rlmbutil.h:
  mvdir
cmd-line-utils/readline/rlprivate.h:
  mvdir
cmd-line-utils/readline/rlshell.h:
  mvdir
cmd-line-utils/readline/rlstdc.h:
  mvdir
cmd-line-utils/readline/rltty.c:
  mvdir
cmd-line-utils/readline/rltty.h:
  mvdir
cmd-line-utils/readline/rltypedefs.h:
  mvdir
cmd-line-utils/readline/rlwinsize.h:
  mvdir
cmd-line-utils/readline/search.c:
  mvdir
cmd-line-utils/readline/shell.c:
  mvdir
cmd-line-utils/readline/signals.c:
  mvdir
cmd-line-utils/readline/tcap.h:
  mvdir
cmd-line-utils/readline/terminal.c:
  mvdir
cmd-line-utils/readline/text.c:
  mvdir
cmd-line-utils/readline/tilde.c:
  mvdir
cmd-line-utils/readline/tilde.h:
  mvdir
cmd-line-utils/readline/undo.c:
  mvdir
cmd-line-utils/readline/util.c:
  mvdir
cmd-line-utils/readline/vi_keymap.c:
  mvdir
cmd-line-utils/readline/vi_mode.c:
  mvdir
cmd-line-utils/readline/xmalloc.c:
  mvdir
cmd-line-utils/readline/xmalloc.h:
  mvdir

Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results

into hundin.mysql.fi:/home/heikki/mysql

  Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search