sql/sql_parse.cc:
  Removed not needed test

  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innodb.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

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

sql/filesort.cc:
  SCCS merged

into mysql.com:/space/my/mysql-4.0

   already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files

sql/sql_base.cc:
  Auto merged
tests/grant.res:
  Auto merged

tests/grant.pl:
  More options for test
tests/grant.res:
  new test results

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

   "DBUG_RETURN undeclared" on Mac OS X)

man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul

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


sql/mysqld.cc:
  Auto merged

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

Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  typo fixed


sql/ha_myisam.cc:
  typo fixed

into sinisa.nasamreza.org:/mnt/work/mysql

into mashka.mysql.fi:/home/my/mysql-3.23

Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1

into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_parse.cc:
  Auto merged

sql/field.cc:
  Fix for --new option
sql/field.h:
  Fix for --new option

sql/sql_select.cc:
  Fix for repllication of INSERT | REPLACE | CREATE  ... SELECT

into mashka.mysql.fi:/home/my/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.0


sql/sql_select.cc:
  Auto merged

INSERT into u SELECT * from t
to the binlog
BEFORE unlocking t (which was read-locked at least in MyISAM),
and not the contrary.

dbug/dbug.c:
  Remove duplicate va_end() call
mysql-test/mysql-test-run.sh:
  Longer stack trace from valgrind
mysys/my_lib.c:
  Fixed wrong dbug printf
sql/slave.cc:
  Simple optimization
sql/sql_class.cc:
  Added DBUG info

   for the patch) (bug #135)

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

into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23