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


mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqltest.c:
  Auto merged

compiles, passes test suite, does magic, has bugs, but none that I know 
at this point. Have not tested everything yet, though. Changed
a lot of code in the client, but normal stuff appears to be working.


BUILD/SETUP.sh:
  make sure client link statically
client/mysqltest.c:
  new commands to test replication probe/parse
include/errmsg.h:
  new error messages
include/mysql.h:
  support for replication auto-magic
libmysql/errmsg.c:
  new error messages
libmysql/libmysql.c:
  replication probe/parse auto-magic
mysql-test/mysql-test-run.sh:
  --client-gdb to run the client in debugger

into hundin.mysql.fi:/home/tonu/mysql-4.0

vio/viossl.c:
  Fixed compile-time warnings by moving code around plus small fixes

BitKeeper/etc/logging_ok:
  auto-union
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.h:
  Added SQLCOM_MULTI_DELETE
sql/sql_parse.cc:
  added division of LEX while keeping Monty's code for symlinks

sql/filesort.cc:
  removing of some extra comments
sql/sql_class.h:
  Clear division between new and old stripping code
sql/sql_delete.cc:
  Stripping of unnecessary code and making it more efficient
sql/sql_parse.cc:
  Better split of LEX into two and enhancements in multi table delete
sql/sql_yacc.yy:
  More efficient division of LEX and optional syntax in multi - table delete
sql/uniques.cc:
  fixing some additional bugs

BitKeeper/etc/logging_ok:
  auto-union

include/violite.h:
  Don't define st_vio if EMBEDDED_LIBRARY.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

Fixed error number handling bug in mysqltest.
Fixed that error number from insert delayed is reported correctly.
merged new vio code with old violite code.


client/mysqltest.c:
  Fixed bug that error numbers wasn't tested properly.
myisam/mi_check.c:
  Moved initialization of variables to avoid a bug.
myisam/mi_create.c:
  Fixed bug in symlink handling.
myisam/mi_test_all.sh:
  Fixed script so that it works.
myisam/myisamchk.c:
  Removed --no-symlinks option
mysql-test/mysql-test-run.sh:
  Cleaned up error message
mysql-test/t/bdb.test:
  Fixed wrong error numbers
mysql-test/t/err000001.test:
  Fixed wrong error numbers
mysql-test/t/innodb.test:
  Fixed wrong error numbers
mysql-test/t/overflow.test:
  Fixed wrong error numbers
mysql-test/t/status.test:
  Ensure that we are using myisam tables for the lock test.
mysys/my_delete.c:
  cleanup
mysys/my_symlink2.c:
  Added option to not overwrite files when using symlinks.
sql/Makefile.am:
  Moved vio to avoid link error.
sql/ha_myisam.cc:
  Fixed symlink handling.
sql/mysqld.cc:
  Changed --skip-symlinks to --skip-symlink
sql/sql_insert.cc:
  Fixed that error number from insert delayed is reported correctly
sql/sql_parse.cc:
  Fixed symlink handling.
sql/sql_table.cc:
  Fixed symlink handling.
vio/vio.c:
  cleanup
vio/viosocket.c:
  c

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


BitKeeper/etc/logging_ok:
  auto-union

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


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

into threads.polyesthetic.msg:/home/tim/my/4

into threads.polyesthetic.msg:/home/tim/my/4


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysys/tree.c:
  Auto merged
sql-bench/bench-init.pl.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

violite.h	Code cleanup


include/violite.h:
  Code cleanup
vio/vio.c:
  Vio code bugfix

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

BitKeeper/etc/ignore:
  Added libmysqld/uniques.cc
client/mysqltest.c:
  Don't core dump if --socket isn't specified.
  
  Add --test-file option, to facilitate running mysqltest under debugger.
libmysqld/Makefile.am:
  We need uniques.cc
libmysqld/lib_sql.cc:
  Tiny cleanup.
libmysqld/libmysqld.c:
  Split mysql_real_query() into mysql_send_query() and
  mysql_read_query_results().

Changed usage of sumlink/realpath  in fn_format() to be compatbile
with old MySQL code


mysys/mf_format.c:
  Changed usage of sumlink/realpath to be compatbile with old MySQL code.

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

the other for multi-table delete


sql/filesort.cc:
  Fixed some bugs for Unique class
sql/item.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/item_sum.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/mysql_priv.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_class.h:
  Adding multi table delete
sql/sql_delete.cc:
  Added multi-table delete
sql/sql_lex.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_lex.h:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_parse.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/sql_select.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_update.cc:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc
sql/sql_yacc.yy:
  Changes caused by splitting lex into two parts, in order to 
  implement UNION's etc, plus added multi-table delete
sql/uniques.cc:
  Fixed some bugs in duplicate stripping
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

commit - it compiles, and test suite still passes, but it is not finished . The
purpose of the commit is backup/code sharing/code review


include/mysql.h:
  API prototypes for replication-aware client
libmysql/libmysql.c:
  some code for replication awareness support

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--

cleanup of register_slave_on_master()


mysql-test/r/rpl000002.result:
  new output of show slave hosts
sql/mysqld.cc:
  user and password are shown in show slave hosts only if show-slave-auth-info option is on
sql/slave.cc:
  cleanup of register_slave_on_master()
sql/sql_repl.cc:
  do not show user/pass for slave unless running with show-slave-auth-info
sql/sql_repl.h:
  show-slave-auth-info

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

    fixed bad merge


sql/slave.cc:
  fixed bad merge

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