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

changed RESTORE TABLE to use name lock

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

be wrong and install would fail.

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

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

manual.texi	Changed instance of "data is" to "data are" (the
manual.texi	manual generally treats data as a plural word).

into central.snake.net:/usr/users/paul/mysql

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

masterless