Docs/manual.texi:
  Third batch of Howard's changes for NuSphere

into nslinuxw2.bedford.progress.com:/users/devp/yfaktoro/bk/mysql


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Second batch of Howard's changes

Docs/manual.texi:
  Mirror addition.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Auto merged
sql/mysql_priv.h:
  Auto merged

Docs/manual.texi:
  Oops, typo.

into laptop.slkc.uswest.net:/home/sasha/src/mysql


BitKeeper/etc/logging_ok:
  auto-union

sql/log_event.cc:
  added sanity check to catch partial event reads from the master

BUILD/compile-pentium-debug-no-bdb:
  forgot to install BDB on my laptop, needed to have this
sql/log.cc:
  fixed initialization warning
sql/sql_insert.cc:
  delayed insert was getting logged on failure. To make things worse,
  all delayed inserts were being logged with query_length=0
sql/sql_repl.cc:
  fixed compiler warnings

BUILD/compile-pentium-debug:
  added -DEXTRA_DEBUG
sql/Makefile.am:
  added slave.h
sql/log_event.h:
  max_buf -> event_len in read_log_event
sql/mysql_priv.h:
  moved the slave part to slave.h
sql/mysqld.cc:
  changes for replcate_do/ignore_table ( does not work yet)
sql/slave.cc:
  removed the stuff covered by slave.h
sql/sql_class.h:
  moved slave stuff to slave.h
sql/sql_repl.h:
  removed stuff covered by slave.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/ChangeLog:
  Whoops, forgot to update the ChangeLog.

Docs/manual.texi:
  Added documentation for ALTER TABLE ... ORDER BY ...
sql/mysql_priv.h:
  Exported make_unireg_sortorder
  Exported setup_order
sql/sql_base.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_parse.cc:
  Changes for ALTER TABLE ... ORDER BY ...
sql/sql_select.cc:
  Moved make_unireg_sortorder and setup_order prototypes to
  mysql_priv.h and made them non-static so that they can be 
  used elsewhere.  Needed for ALTER TABLE ... ORDER BY ...

Docs/manual.texi:
  First batch of changes from howard katz
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

BitKeeper/etc/logging_ok:
  Auto merged

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

myisam/ft_parser.c:
  minor bug that causes slightly incorrect weights and was found only by occation fixed

Docs/manual.texi:
  Added index for LOAD_FILE()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  clarified language about logo requirement.

with BEGIN WORK.

into threads.polyesthetic.msg:/usr/local/src/my/work

ha_berkeley.cc	bug fixes to make OPT_BEGIN work properly
handler.cc	bug fixes to make OPT_BEGIN work properly


sql/handler.cc:
  bug fixes to make OPT_BEGIN work properly
sql/ha_berkeley.cc:
  bug fixes to make OPT_BEGIN work properly
sql/sql_parse.cc:
  test for changing to auto_commit mode was backwards

into mysql.sashanet.com:/home/sasha/src/bk/mysql

    fixed coredump in concat_ws
sql/item_strfunc.h
    fixed coredump in concat_ws
sql/mini_client.cc
    added mc_mysql_error()
sql/mini_client.h
    added mc_mysql_errno()
sql/mysqlbinlog.cc
    fixed bug in --postion for local files
sql/slave.cc
    more verbose message on bad net reads
sql/sql_repl.cc
    send errno on error in mysql_binlog_send


sql/item_strfunc.cc:
  fixed coredump in concat_ws
sql/item_strfunc.h:
  fixed coredump in concat_ws
sql/mini_client.cc:
  added mc_mysql_error()
sql/mini_client.h:
  added mc_mysql_errno()
sql/mysqlbinlog.cc:
  fixed bug in --postion for local files
BitKeeper/etc/ignore:
  Added client/.mysqladmin.c.swp to the ignore list
sql/slave.cc:
  more verbose message on bad net reads
sql/sql_repl.cc:
  send errno on error in mysql_binlog_send

certain circumstances.


include/global.h:
  Fix for gcc with strict aliasing.
  Thanks to teg@redhat.com for the patch.
strings/strstr-sparc.s:
  %g6 -> %o2
  %g6 and %g7 are reserved for OS use by Sun's ABI.
  Thanks to teg@redhat.com for the patch.

into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    send the diffs
Docs/manual.texi
    updated change history
include/my_sys.h
    Moved safemalloc_mem_limit here
mysys/safemalloc.c
    fixed up safemalloc_mem_limit
sql/mysqld.cc
    moved safemalloc_mem_limit declaration to my_sys.h


BitKeeper/triggers/post-commit:
  send the diffs
Docs/manual.texi:
  updated change history
include/my_sys.h:
  Moved safemalloc_mem_limit here
mysys/safemalloc.c:
  fixed up safemalloc_mem_limit
sql/mysqld.cc:
  moved safemalloc_mem_limit declaration to my_sys.h

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/logging_ok:
  Auto converge

configure.in:
  fixed to properly handle 1 digit branch
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

include/ft_global.h:
  fixed bug with ORDER BY
sql/ha_myisam.cc:
  fixed bug with ORDER BY
sql/item_func.cc:
  fixed bug with ORDER BY
sql/item_func.h:
  fixed bug with ORDER BY
sql/sql_select.cc:
  fixed bug with ORDER BY

    mutex now initialized in the constructor
sql/sql_class.h
    intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc
    fixed typo in error message
    if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number
repl-tests/test-repl-ts/repl-timestamp.master.reject
    New BitKeeper file ``repl-tests/test-repl-ts/repl-timestamp.master.reject''


BitKeeper/etc/ignore:
  Added repl-tests/test-repl-ts/repl-timestamp.master.reject to the ignore list
sql/slave.cc:
  mutex now initialized in the constructor
sql/sql_class.h:
  intialize MASTER_INFO mutex in the constructor
sql/sql_repl.cc:
  fixed typo in error message
  if the user does not specify offset in CHANGE MASTER TO, set it to skip magic number

into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged

added two new test cases


BitKeeper/etc/ignore:
  Added mysql-test/r/3.23/sel000004.result.reject mysql-test/var/lib/mysql-bin.006 mysql-test/var/lib/test/elt_ck1.frm mysql-test/var/lib/test/elt_ck1.MYD mysql-test/var/lib/test/elt_ck1.MYI mysql-test/var/lib/test/elt_ck2.frm mysql-test/var/lib/test/elt_ck2.MYD mysql-test/var/lib/test/elt_ck2.MYI to the ignore list
mysql-test/r/3.23/sel000004.result:
  new result
mysql-test/r/3.23/sel000005.result:
  new result
sql/item_strfunc.cc:
  fixed bug in make_set() and elt()

Docs/manual.texi:
  Added mirror in USA.

Docs/manual.texi:
  Added mirror in Argentina.

From now on FULLTEXT search is initialized expilictly in mysql_select()


sql/item_func.cc:
  FULLTEXT expilict initialization
sql/opt_ft.h:
  FULLTEXT expilict initialization
sql/opt_range.h:
  FULLTEXT expilict initialization
sql/ha_myisam.cc:
  FULLTEXT expilict initialization
sql/ha_myisam.h:
  FULLTEXT expilict initialization
sql/handler.h:
  FULLTEXT expilict initialization
sql/item_func.h:
  FULLTEXT expilict initialization
sql/sql_select.cc:
  FULLTEXT expilict initialization
myisam/ft_search.c:
  FULLTEXT expilict initialization

into threads.polyesthetic.msg:/usr/local/src/my/work


Docs/manual.texi:
  Auto merged