If I ruined anything, write your complaints to sasha@mysql.com


sql/sql_delete.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_lex.h:
  Unchecked changes, so that I could run mysql-test
sql/sql_parse.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_union.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_yacc.yy:
  Unchecked changes, so that I could run mysql-test
BitKeeper/etc/ignore:
  Added libmysqld/examples/link_sources to the ignore list

Added Erik's texts on logos/trademarks, licences, business services. Fixup location/refs/dups later.
Added Kaj's text MySQL 4.0 in a Nutshell. Fixup location/refs later.

Shuffled transit Perl Installation Comments to 2.7
Shuffled transit Functions for Use with GROUP BY Clauses to 6.3.6

BitKeeper/etc/ignore:
  Added Docs/texi2dvi.out to the ignore list

into evoq.mwagner.org:/home/mwagner/work/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  A legit type fix... okay, so maybe it's one more trigger check.

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0

BitKeeper/triggers/post-commit:
  Added docs@ to get manual edits

client/mysql.cc:
  Testing commit trigger

Docs/bk.txt:
  Testing non-manual commit

Docs/manual.texi:
  One more.. sorry for the spam. :)

Docs/manual.texi:
  One more test

manual.texi	Testing


Docs/manual.texi:
  Testing
Docs/bk.txt:
  Testing commit

manual.texi	test


Docs/manual.texi:
  testing

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Removed doubled paragraph.

into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

manual updated


mysql-test/t/fulltext_update.test:
  Change mode to -rw-rw-r--
Docs/manual.texi:
  updated
mysql-test/mysql-test-run.sh:
  make --gdb to work (as mysql-test-run does not wait for keypress anymore)

Fixed UNION from @subsection to @subsubsection under SELECT.

Inserted note about stable codebase and backwards compatibility in "How stable is MySQL" section.


BitKeeper/etc/ignore:
  Added Docs/#manual.texi# to the ignore list

Docs/Makefile.am:
  Added docbook-fixup.pl.
Docs/manual.texi:
  Fixed small bug.  Removed old commented out part.

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

into tetra.spaceapes.com:/home/jcole/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

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


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged

use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux


client/mysqltest.c:
  added MAX_TABLES variable
libmysql/libmysql.c:
  portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
  fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
  make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
  make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
  64-bit portability fixes
sql/mini_client.h:
  64-bit portability fixes
sql/slave.cc:
  64-bit portability fixes
tools/mysqlmanager.c:
  64-bit portability fixes

mysql-test/r/fulltext_cache.result:
  fixed
mysql-test/r/fulltext_left_join.result:
  fixed
mysql-test/r/fulltext_multi.result:
  fixed
mysql-test/r/fulltext_order_by.result:
  fixed