Docs/manual.texi:
  Reactivated some mirrors.

sql/opt_ft.cc:
  Change mode to -rw-rw-r--
sql/opt_ft.h:
  Change mode to -rw-rw-r--

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


Docs/manual.texi:
  Auto merged

    replication updates
sql/opt_range.h
    fixed compiler warning
sql/slave.cc
    fixed handling of long usernames
    fixed insert_id + query log event processing atomicity in the case
    of slave death
    fix edcharset coversion to not be global to all threads
sql/sql_class.h
    fix to make insert_id event and the subsequent query event be still processed
    atomically if slave dies in the middle
sql/sql_select.cc
    temp fix to make it compile 
repl-tests/test-auto-inc/run.test@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/run.test''
repl-tests/test-auto-inc/x.master@1.1
    New BitKeeper file ``repl-tests/test-auto-inc/x.master''



Docs/manual.texi:
  replication updates
sql/opt_range.h:
  fixed compiler warning
sql/slave.cc:
  fixed handling of long usernames
  fixed insert_id + query log event processing atomicity in the case
  of slave death
  fix edcharset coversion to not be global to all threads
sql/sql_class.h:
  fix to make insert_id event and the subsequent query event be still processed
  atomically if slave dies in the middle
sql/sql_select.cc:
  temp fix to make it compile

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changed evenheading on NuSphere manual.

configure.in:
  merged
BitKeeper/etc/logging_ok:
  Auto merged
sql/filesort.cc:
  merged
sql/sql_select.cc:
  merged

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


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

    set character set is not being logged


sql/log.cc:
  set character set is not being logged

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

Fixes when using column privileges
Manual updates


Docs/manual.texi:
  Comments from MySQL training + distinct optimization
extra/my_print_defaults.c:
  Added --defaults-extra-file
include/my_sys.h:
  Added --defaults-extra-file
mysys/default.c:
  Added --defaults-extra-file
sql/sql_acl.cc:
  Tables with only column privileges didn't show up in SHOW GRANTS or SHOW TABLES
sql/sql_select.cc:
  DISTINCT optimization
sql/sql_select.h:
  DISTINCT optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

    Added magic number to binlog
sql/log_event.cc
    distinquish bogus data from truncated logs
sql/log_event.h
    added magic number
    added LOG_READ_TRUNC error
sql/mysqlbinlog.cc
    fixed to handle magic number
    added O_BINARY to my_fopen
sql/mysqld.cc
    added code for replicate-rewrite-db
sql/slave.cc
    replicate-rewrite-db
    O_BINARY
    handle magic
sql/sql_class.h
    added i_string_pair class
sql/sql_repl.cc
    added magic
    better error messages
support-files/magic
    added magic for binlog

Added test case for replication of queries with error


sql/log.cc:
  Added magic number to binlog
sql/log_event.cc:
  distinquish bogus data from truncated logs
sql/log_event.h:
  added magic number
  added LOG_READ_TRUNC error
sql/mysqlbinlog.cc:
  fixed to handle magic number
  added O_BINARY to my_fopen
sql/mysqld.cc:
  added code for replicate-rewrite-db
sql/slave.cc:
  replicate-rewrite-db
  O_BINARY
  handle magic
sql/sql_class.h:
  added i_string_pair class
sql/sql_repl.cc:
  added magic
  better error messages
support-files/magic:
  added magic for binlog

Docs/manual.texi:
  Removed bugs from manual; Updated CHECK TABLE

Docs/manual.texi:
  Auto merged

configure.in:
  Fix for mkstemp
libmysql/Makefile.shared:
  Fix for mkstemp
myisam/mi_open.c:
  Added more debug info
mysys/mf_tempfile.c:
  Fixed type
sql/sql_repl.cc:
  Added missing header file

ltmain.sh:
  Don't add -lc to deplibs under FreeBSD

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
Docs/manual.texi:
  Merge
support-files/mysql.spec.sh:
  Merge

Docs/manual.texi:
  Updates in the links sections
config.guess:
  Added fixes for Darwin
config.sub:
  Added fixes for Darwin
configure.in:
  Added fixes for Darwin
extra/my_print_defaults.c:
  Fixed typo
include/my_pthread.h:
  Added fixes for Darwin
ltconfig:
  Portability fix
myisam/mi_check.c:
  Make myisamchk more silent
mysys/Makefile.am:
  Added mf_tempfile.c
mysys/mf_cache.c:
  Remove not used parts
mysys/mf_tempfile.c:
  Fix for Solaris
sql/log.cc:
  Fix for Windows
sql/sql_cache.cc:
  Fix for Darwin
sql/sql_show.cc:
  Fix for temporary tables
strings/strtol.c:
  Fix for Darwin
support-files/mysql.spec.sh:
  Fix for documentation files that are installed compressed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  index hits added.
BitKeeper/etc/logging_ok:
  ***MISSING TEXT***

Docs/manual.texi:
  Adde NuSphere editor's changes to pages 201-240.

Docs/Makefile.am   Do not compile manual.pdf if pdftex not present


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/Makefile.am:
  Do not compile manual.pdf if pdftex not present
configure.in:
  Add check for pdftex

ft_parser.c	Nasty buffer overflow fixed


myisam/ft_parser.c:
  Nasty buffer overflow fixed
sql/sql_table.cc:
  key length limit check disabled for FULLTEXT

Docs/manual.texi:
  @uref'ed some order.mysql.com URLs that I caught.

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

added error_code to query event, and checking to see if we get the
expected error on the slave
removed obsolete code from slave.cc


sql/log_event.cc:
  added mutex as an argument to FILE read_log_event functions
sql/log_event.h:
  added error_code for the query event
sql/mysqlbinlog.cc:
  fix for new form of read_log_event
sql/slave.cc:
  removed obsolte code with fetch nx table
  added check to see if the query runs with the same error on the slave
  as it did on the master
sql/sql_repl.cc:
  fixed mutex problem around read_log_event

Docs/manual.texi:
  Minor fixes to recent change notes.

Error on full disk on repair.
SIGHUP signal handling.
Update with keys on timestamp
Portability fixes


Docs/manual.texi:
  Added documentation about automatic repair of MyISAM tables
client/mysql.cc:
  Remove usage of tempnam.
include/my_sys.h:
  Added create_temp_file
include/myisam.h:
  Fix for disk full on repair
myisam/mi_check.c:
  Fix for disk full on repair
myisam/sort.c:
  Fix for disk full on repair & removed usage of tempnam()
mysys/mf_cache.c:
  Remove usage of tempnam()
mysys/mf_dirname.c:
  Changed convert_dirname to return end 0
mysys/my_fopen.c:
  Security fixes
mysys/my_tempnam.c:
  remove blanks
readline/bind.c:
  Portability fixes
readline/complete.c:
  Portability fixes
readline/histexpand.c:
  Portability fixes
readline/input.c:
  Portability fixes
readline/search.c:
  Portability fixes
readline/shell.c:
  Portability fixes
readline/terminal.c:
  Portability fixes
readline/tilde.c:
  Portability fixes
readline/undo.c:
  Portability fixes
regex/cname.h:
  Portability fixes
regex/debug.c:
  Portability fixes
regex/main.c:
  Portability fixes
regex/regcomp.c:
  Portability fixes
regex/regerror.c:
  Portability fixes
sql/filesort.cc:
  Remove dummy code
sql/ha_myisam.cc:
  Automatic repair of MyISAM tables
sql/ha_myisam.h:
  Automatic repair of MyISAM tables
sql/handler.cc:
  Automatic repair of MyISAM tables
sql/handler.h:
  Automatic repair of MyISAM tables
sql/key.cc:
  Fix for UPDATE with key on timestamp column
sql/mysql_priv.h:
  Automatic repair of MyISAM tables
sql/mysqld.cc:
  Automatic repair of MyISAM tables & signal SIGHUP handling
sql/sql_base.cc:
  Automatic repair of MyISAM tables
sql/sql_class.cc:
  Automatic repair of MyISAM tables
sql/sql_class.h:
  Fix for insert with reference to columns
sql/sql_insert.cc:
  Fix for insert with reference to columns
sql/table.cc:
  Automatic repair of MyISAM tables
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

 kill zombie COM_BINLOG_DUMP with the same server id on connect


sql/mysql_priv.h:
  made kill_one_thread global scope
sql/slave.cc:
  skip updates with the same server id as self
  fixed compiler warning
sql/sql_parse.cc:
  COM_BINLOG_DUMP is followed by a simulation of COM_QUIT for proper thread clean up
sql/sql_repl.cc:
  kill zombie COM_BINLOG_DUMP with the same server id on connect,
  more verbose binlog_send process status

manual.texi	Browsers don't like tables in <ul> lists. :(


Docs/manual.texi:
  Removed the @itemization of the MySQL books section.
  Browsers don't like tables in <ul> lists. :(

it earlier

repl-tests/test-dump/run.test:
  increased wait for propogation
repl-tests/test-repl/run.test:
  increased wait for propogation

Docs/manual.texi:
  Added uklinux.net mirror.

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


sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

sql_repl.* will push this one, since the replication code now works


repl-tests/test-dump/run.test:
  added slave/master reset
sql/Makefile.am:
  added sql_repl.*
sql/log_event.cc:
  moved #defines to log_event.h
sql/log_event.h:
  moved #defines from log_event.cc
sql/mysql_priv.h:
  added LOCK_server_id
sql/mysqlbinlog.cc:
  added server id
sql/mysqld.cc:
  added mutex_init for LOCK_server_id
sql/slave.cc:
  added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
  moved replication code to sql_repl.*
sql/sql_parse.cc:
  moved replication code to sql_repl.*

for the patch.


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