into teton.kitebird.com:/home/paul/mysql

Docs/manual.texi:
  minor clarifications to Windows section

manual.texi	add mention of mysql_escape_string() for PHP API;
manual.texi	add mention of PreparedStatement, placeholders for JDBC API.


Docs/manual.texi:
  correct instance of mysql_escape() to mysql_escape_string();
  add mention of mysql_escape_string() for PHP API;
  add mention of PreparedStatement, placeholders for JDBC API.

innobase/include/mem0pool.h:
  Fix a bus error in aligment of longlong on Solaris

BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~f761da5546f0d362:
  Delete: sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~79ac0482599eace1:
  Delete: sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~dfc480becae45236:
  Delete: sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~a2a77f37b689cd63:
  Delete: sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~7dd5ac726f86cf0b:
  Delete: sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~441a6aefd381e319:
  Delete: sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~d12a7edef05d7185:
  Delete: sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~ddcf36cdf3f72e8c:
  Delete: sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg~2db07249379f36:
  Delete: sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg
sql-bench/Comments/postgres.benchmark:
  b

manual.texi	2) manual says mysql.server uses "bindir"; it doesn't.


Docs/manual.texi:
  1) manual says mysql.server uses "user"; it doesn't.
  2) manual says mysql.server uses "bindir"; it doesn't.

into teton.kitebird.com:/home/paul/mysql


Docs/manual.texi:
  Auto merged

manual.texi	small misc changes


Docs/manual.texi:
  fix more out-of-date mysql.server commentary, plus
  small misc changes

Docs/manual.texi:
  SCCS merged

Fixed option for symlinks


Docs/manual.texi:
  Updated symlink handling.
sql-bench/Comments/postgres.benchmark:
  Updated benchmark text
sql-bench/Makefile.am:
  Added graph-compare-results
sql-bench/compare-results.sh:
  Don't reset the cmp option.
sql-bench/crash-me.sh:
  Updated transaction testing.
sql-bench/limits/mysql-3.23.cfg:
  Updated benchmark run
sql-bench/limits/mysql.cfg:
  Updated benchmark run
sql-bench/limits/pg.cfg:
  Updated benchmark run
sql-bench/server-cfg.sh:
  Don't do vacuum too often.
sql-bench/test-insert.sh:
  Don't do vacuum too often.
sql/mysqld.cc:
  Changed skip-symlinks to skip-symlink

manual.texi	to 3-arg form so last arg shows up in printed output.
manual.texi	2) mysql.server no longer needs to use su or store the
manual.texi	root password.
manual.texi	3) other misc small changes.


Docs/manual.texi:
  earlier change to @xref{} used 2-arg form; change
  to 3-arg form so last arg shows up in printed output.
  mysql.server no longer needs to use su or store the
  root password.
  other misc small changes

manual.texi	not [mysql-hot-copy].


Docs/manual.texi:
  mysqlhotcopy reads [mysqlhotcopy] option group,
  not [mysql-hot-copy].

manual.texi	-> @xref{safe_mysqld, @code{safe_mysqld}}
manual.texi	Unixes -> versions of Unix (or similar edit)
manual.texi	@xref{mysqlxxx} -> @xref{mysqlxxx, @code{mysqlxxx}}


Docs/manual.texi:
  @xref{safe_mysqld}
  -> @xref{safe_mysqld, @code{safe_mysqld}}
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql-bench/Comments/postgres.benchmark:
  Added warning about PostgreSQL 7.1.1

row0sel.c	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.c	CHECK TABLE now also for InnoDB, a join speed optimization
rem0cmp.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.c	CHECK TABLE now also for InnoDB, a join speed optimization
page0page.c	CHECK TABLE now also for InnoDB, a join speed optimization
row0mysql.h	CHECK TABLE now also for InnoDB, a join speed optimization
trx0trx.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.h	CHECK TABLE now also for InnoDB, a join speed optimization
btr0pcur.ic	CHECK TABLE now also for InnoDB, a join speed optimization
btr0btr.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0cur.c	CHECK TABLE now also for InnoDB, a join speed optimization
btr0sea.c	CHECK TABLE now also for InnoDB, a join speed optimization
innodb.result	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.cc	CHECK TABLE now also for InnoDB, a join speed optimization
ha_innobase.h	CHECK TABLE now also for InnoDB, a join speed optimization


sql/ha_innobase.cc:
  CHECK TABLE now also for InnoDB, a join speed optimization
sql/ha_innobase.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
mysql-test/r/innodb.result:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0btr.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0cur.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/btr/btr0sea.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0btr.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0cur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/btr0pcur.ic:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/row0mysql.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/include/trx0trx.h:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/page/page0page.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/rem/rem0cmp.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0mysql.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/row/row0sel.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
innobase/trx/trx0trx.c:
  CHECK TABLE now also for InnoDB, a join speed optimization
Docs/manual.texi:
  website address change

Fixed problem with command line arguments on 64 bit machines when
we use ~0 to indicate 'no limit'


include/m_string.h:
  Declare stpcpy() to fix portability problem on AIX with gcc 2.95.3
mysys/getvar.c:
  Fixed problem on 64 bit machines when we use ~0 to indicate 'no limit'.
sql-bench/Comments/postgres.benchmark:
  U

New postgresql crash-me file.
Increased blob size in benchmarks from 65K to 1M.


mysql-test/t/select.test:
  Added ABS() to make tests more portable
mysys/tree.c:
  Added missing call to tree->free  (MySQL didn't use this)
sql-bench/Comments/postgres.benchmark:
  Updated documentation
sql-bench/bench-init.pl.sh:
  Updated version number (changed blob size)
sql-bench/limits/pg.cfg:
  New postgres results
sql-bench/server-cfg.sh:
  Updated to PostgreSQL 7.1.1
sql-bench/test-connect.sh:
  Changed select_big -> select_big_str
tests/fork_big.pl:
  Added count(distinct) test

BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged

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

into central.snake.net:/home/paul/mysql


Docs/manual.texi:
  Auto merged

manual.texi	can be used.


Docs/manual.texi:
  ISAM Tables: show how to conver to MySQL so mysqlcheck
  can be used.

Fixed file permissions in Flags


Docs/Flags/australia.eps:
  Change mode to -rw-rw-r--
Docs/Flags/australia.txt:
  Change mode to -rw-rw-r--
Docs/Flags/austria.eps:
  Change mode to -rw-rw-r--
Docs/Flags/austria.txt:
  Change mode to -rw-rw-r--
Docs/Flags/canada.eps:
  Change mode to -rw-rw-r--
Docs/Flags/canada.txt:
  Change mode to -rw-rw-r--
Docs/Flags/czech-republic.eps:
  Change mode to -rw-rw-r--
Docs/Flags/czech-republic.txt:
  Change mode to -rw-rw-r--
Docs/Flags/germany.eps:
  Change mode to -rw-rw-r--
Docs/Flags/germany.txt:
  Change mode to -rw-rw-r--
Docs/Flags/great-britain.eps:
  Change mode to -rw-rw-r--
Docs/Flags/great-britain.txt:
  Change mode to -rw-rw-r--
Docs/Flags/hungary.eps:
  Change mode to -rw-rw-r--
Docs/Flags/hungary.txt:
  Change mode to -rw-rw-r--
Docs/Flags/israel.eps:
  Change mode to -rw-rw-r--
Docs/Flags/israel.txt:
  Change mode to -rw-rw-r--
Docs/Flags/italy.eps:
  Change mode to -rw-rw-r--
Docs/Flags/italy.txt:
  Change mode to -rw-rw-r--
Docs/Flags/japan.eps:
  Change mode to -rw-rw-r--
Docs/Flags/japan.txt:
  Change mode to -rw-rw-r--
Docs/Flags/russia.eps:
  Change mode to -rw-rw-r--
Docs/Flags/russia.txt:
  Change mode to -rw-rw-r--
Docs/Flags/south-korea.eps:
  Change mode to -rw-rw-r--
Docs/Flags/south-korea.txt:
  Change mode to -rw-rw-r--
Docs/Flags/sweden.eps:
  Change mode to -rw-rw-r--
Docs/Flags/sweden.txt:
  Change mode to -rw-rw-r--
Docs/Flags/taiwan.eps:
  Change mode to -rw-rw-r--
Docs/Flags/taiwan.txt:
  Change mode to -rw-rw-r--
Docs/Flags/usa.eps:
  Change mode to -rw-rw-r--
Docs/Flags/usa.txt:
  Change mode to -rw-rw-r--

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

client/errmsg.c:
  Added portuguese error messages.

Docs/manual.texi:
  Auto merged

error message if the table open or the index creation failed.
Updated portuguese error messages.
Fix for OS/2 that affected CHECK TABLE.


Docs/manual.texi:
  Changelog.
libmysql/errmsg.c:
  Updated portuguese error messages
mysys/my_copy.c:
  Fix for OS/2
sql/net_pkg.cc:
  cleanup
sql/share/portuguese/errmsg.txt:
  Updated portuguese error messages
sql/slave.cc:
  Cleanup.
  Fixed bug that caused client to hang because mysqld never did
  send an error message if the table open or the index creation failed.
sql/sql_parse.cc:
  Moved handling of 'no_send_ok' to fetch_nx_table.
sql/sql_table.cc:
  Cleanup.

Docs/manual.texi:
  Changed Jay Flaherty's email address.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Don't force repair of tables that are not closed properly.


Docs/manual.texi:
  Added information about symbolic links.
include/my_sys.h:
  symbolic link support
myisam/mi_check.c:
  Don't force repair of tables that are not closed properly.
myisam/myisamchk.c:
  Version number change.
mysys/my_static.c:
  symbolic link support
mysys/my_symlink2.c:
  Disabling of symbolic link support
sql/mysqld.cc:
  Disabling of symbolic link support

sql/slave.cc:
  Cleanup up indentation.
  Change to use ER_SAFE() instead of ER().
sql/unireg.h:
  Added ER_SAFE()

Docs/manual.texi:
  Link info change
include/my_sys.h:
  Added functions for symlink support
libmysql/Makefile.shared:
  Added mf_symlink.c to library.
mysys/Makefile.am:
  Added functions for symlink support
mysys/mf_same.c:
  cleanup
mysys/my_symlink.c:
  Added functions for symlink support

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


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

sql/slave.cc:
  print expected error number
sql/unireg.h:
  sanity check for errno range in ER(X)

sync0sync.ic	Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word


innobase/include/sync0sync.ic:
  Had deleted inadvertently lock word = 0 from the non-gcc+i86 case in mutex_reset_lock_word

sync0sync.ic	Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety


innobase/include/sync0sync.ic:
  Use XCHG also to reset the mutex lock word: it makes a serialization point to code on Intel and gives more safety
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changelog