into nslinux.bedford.progress.com:/users/devp/jcole/bk/mysql

into tetra.bedford.progress.com:/usr/home/jcole/bk/mysql

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

    fixed typo in the error message
sql/sql_base.cc
    fixed bugs in reopen_name_locked_table() after talking to Monty

added a test case for restore + select

manual.texi	a better way to integrate into Gizmo.

changed RESTORE TABLE to use name lock

manual.texi	non-existent sites (sent mail to maintainers).

fixed buffer overflow in fn_format()

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

run-all-tests for replication

manual.texi	machine can be plugged back in now. :)

logging_ok	Logging to logging@openlogging.org accepted

    Updates for BACKUP TABLE/RESTORE TABLE
    Added Replication FAQ
    Cleaned up TODO list removing a duplicate and features already implemented
    Updated changelog for 3.23.25
sql/sql_lex.h
    Re-added backup_dir to Lex which dispappeared while resovling conflicts

  FULLTEXT doesn't actually work with BLOBs.

RESTORE TABLE FROM 'directory'
log on slave when it connects to the master

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