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


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged

mysql-test/Makefile.am:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000015.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl000018.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_flush_log_loop.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_log_pos.result:
  Changed binlog.001 to be binlog.000001
mysql-test/r/rpl_rotate_logs.result:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl000017-slave.sh:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_log.test:
  Changed binlog.001 to be binlog.000001
mysql-test/t/rpl_rotate_logs.test:
  Changed binlog.001 to be binlog.000001
sql/log.cc:
  Changed binlog.001 to be binlog.000001

delete ugly comma


sql/share/czech/errmsg.txt:
  correct English
sql/share/danish/errmsg.txt:
  correct English
sql/share/dutch/errmsg.txt:
  correct English
sql/share/english/errmsg.txt:
  correct English
sql/share/estonian/errmsg.txt:
  correct English
sql/share/french/errmsg.txt:
  correct English
sql/share/german/errmsg.txt:
  correct English
sql/share/greek/errmsg.txt:
  correct English
sql/share/hungarian/errmsg.txt:
  correct English
sql/share/italian/errmsg.txt:
  correct English
sql/share/japanese/errmsg.txt:
  correct English
sql/share/korean/errmsg.txt:
  correct English
sql/share/norwegian-ny/errmsg.txt:
  correct English
sql/share/norwegian/errmsg.txt:
  correct English
sql/share/polish/errmsg.txt:
  correct English
sql/share/portuguese/errmsg.txt:
  correct English
sql/share/romanian/errmsg.txt:
  correct English
sql/share/russian/errmsg.txt:
  correct English
sql/share/serbian/errmsg.txt:
  correct English
sql/share/slovak/errmsg.txt:
  correct English
sql/share/spanish/errmsg.txt:
  correct English
sql/share/swedish/errmsg.txt:
  correct English
sql/share/ukrainian/errmsg.txt:
  correct English
sql/sql_lex.h:
  delete ugly comma

include/mysqld_error.h:
  add error for corrupt help db
scripts/Makefile.am:
  add script for fill help db
scripts/mysql_install_db.sh:
  modify for add help db
sql/Makefile.am:
  modify for add sql_help.cc
sql/lex.h:
  add help command
sql/mysql_priv.h:
  add mysqld_help function declaration
sql/share/czech/errmsg.txt:
  add message for help-db error
sql/share/danish/errmsg.txt:
  add message for help-db error
sql/share/dutch/errmsg.txt:
  add message for help-db error
sql/share/english/errmsg.txt:
  add message for help-db error
sql/share/estonian/errmsg.txt:
  add message for help-db error
sql/share/french/errmsg.txt:
  add message for help-db error
sql/share/german/errmsg.txt:
  add message for help-db error
sql/share/greek/errmsg.txt:
  add message for help-db error
sql/share/hungarian/errmsg.txt:
  add message for help-db error
sql/share/italian/errmsg.txt:
  add message for help-db error
sql/share/japanese/errmsg.txt:
  add message for help-db error
sql/share/korean/errmsg.txt:
  add message for help-db error
sql/share/norwegian-ny/errmsg.txt:
  add message for help-db error
sql/share/norwegian/errmsg.txt:
  add message for help-db error
sql/share/polish/errmsg.txt:
  add message for help-db error
sql/share/portuguese/errmsg.txt:
  add message for help-db error
sql/share/romanian/errmsg.txt:
  add message for help-db error
sql/share/russian/errmsg.txt:
  add message for help-db error
sql/share/serbian/errmsg.txt:
  add message for help-db error
sql/share/slovak/errmsg.txt:
  add message for help-db error
sql/share/spanish/errmsg.txt:
  add message for help-db error
sql/share/swedish/errmsg.txt:
  add message for help-db error
sql/share/ukrainian/errmsg.txt:
  add message for help-db error
sql/sql_lex.h:
  add SQLCOM_END 
  and help_arg in Lex
sql/sql_parse.cc:
  add SQLCOM_HELP handler
sql/sql_yacc.yy:
  add help command

mysql-test/r/subselect.result:
  test for union rexecution bug
mysql-test/t/subselect.test:
  test for union rexecution bug

small Item_ref optimization

fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug


mysql-test/r/subselect.result:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
mysql-test/t/subselect.test:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
sql/sql_lex.cc:
  fixed subselect UNION ALL bug
sql/sql_lex.h:
  fixed subselect UNION ALL bug
sql/sql_parse.cc:
  fixed subselect UNION ALL bug
sql/sql_select.cc:
  fixed subselect error handling bug
  fixed explain UNION subselect bug
sql/sql_union.cc:
  fixed thd->lex.select restoring
  code cleanup
  fixed subselect error handling bug
  fixed subselect UNION ALL bug
sql/sql_yacc.yy:
  fixed subselect UNION ALL bug

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


BitKeeper/deleted/.del-.del-Makefile.emx~1:
  Delete: BitKeeper/deleted/.del-Makefile.emx~1
BitKeeper/deleted/.del-.del-Makefile.riscos:
  Delete: BitKeeper/deleted/.del-Makefile.riscos

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
  'Auto converge rename'
Docs/manual.texi:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~9d3403dbb31de075:
  'Auto converge rename'

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

  Include univ.i before any system headers to remove a large file compilation failure on AIX


innobase/pars/pars0grm.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/lexyy.c:
  Include univ.i before any system headers to remove a large file compilation failure on AIX

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

full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it


BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno innobase/stamp-h1 myisam/rt_test.MYD myisam/rt_test.MYI stamp-h1 to the ignore list
include/my_base.h:
  support for HA_READ_PREFIX_LAST_OR_PREV
myisam/mi_search.c:
  full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
myisam/mi_static.c:
  full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
sql/opt_range.cc:
  support for HA_READ_PREFIX_LAST_OR_PREV
  protected by #if NOT_IMPLEMENTED_YET, not all table handlers support it
sql/sql_handler.cc:
  support for HA_READ_PREFIX_LAST_OR_PREV

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk


sql/item_func.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  unicode mapping


sql/share/charsets/cp1251.conf:
  unicode mapping

into mysql.com:/home/nick/mysql/repository/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

mysql-test/mysql-test-run.sh:
  Added --rpl option which tests all t/rpl*.test tests.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  removed "depriciated" as requested by salle


sql/share/charsets/Index:
  removed "depriciated" as requested by salle

and CHARSET is now the same with CHARACTER SET:

CREATE DATABASE name 
  [DEFAULT] {CHAR SET | CHARACTER SET | CHARSET} csname


CREATE TABLE (...)  [DEFAULT] {CHARSET | CHARACTER SET | CHAR SET} [=] csname

To Paul and Arjen:
However this should be recommended in db option to conform SQL99:
CREATE DATABASE dbname DEFAULT CHARACTER SET csname
In table option there is no SQL99 recommended syntax as far as
table charset is MySQL extension.

into mysql.com:/space/my/mysql-3.23

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0