include/m_ctype.h:
  Remove not used define

Fix bug in SHOW GRANTS when there is a column privilege but no table privilege


include/mysql.h:
  Make server_inited external
libmysqld/libmysqld.c:
  Remove reference to (wrong) external variable
mysql-test/r/grant.result:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/r/mix_innodb_myisam_binlog.result:
  Change to use tables t1 and t2
mysql-test/t/grant.test:
  Fixed up grant test to not user 'user1' or 'user2'
  Check for bug in SHOW GRANTS when there is a column privilege but no table privilege
mysql-test/t/mix_innodb_myisam_binlog.test:
  Change to use tables t1 and t2
sql/sql_acl.cc:
  Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
sql/sql_parse.cc:
  Use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

into deer.(none):/home/hf/work/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1056/mysql-4.0


client/mysqldump.c:
  Auto merged

sql/sql_parse.cc:
  Replication's commands were allowed, but didn't have proper implementations
  for embedded library

i fixed this in 4.1 in slightly different way


libmysqld/lib_sql.cc:
  Initialization's flag was made global
libmysqld/libmysqld.c:
  Check for mysql_server_init call added

just to make it compatible with the manual
(fixed bug #1056)


client/mysqldump.c:
  added space after first '--' in the long '----....' comment line
  just to make it compatible with the manual
  (fixed bug #1056)

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

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

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

Another fix applied

Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows.


myisam/mi_locking.c:
  Added DBUG info
myisam/mi_open.c:
  Added DBUG info
myisam/mi_update.c:
  More comments
  Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header
  was not updated directly after an UPDATE of split dynamic rows.
mysql-test/r/myisam.result:
  Added test case for MyISAM UPDATE bug
mysql-test/t/myisam.test:
  Added test case for MyISAM UPDATE bug

Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function


innobase/fsp/fsp0fsp.c:
  Added seperate error message to avoid VC++ 6.0 compiler bug

Fix make_win_src_distribution


scripts/make_win_src_distribution.sh:
  Fix in case of default to .zip, use 'recode' if available

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

client/mysqldump.c:
  Better quoting patch

into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0

configure.in:
  Changes for UnixWare 7.1.X andOpenUNIX 8.0.0 to allow gcc.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options)

Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column.

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

   (thanks to Haakon Innerdal for spotting this one)


support-files/mysql.spec.sh:
   - added a missing %define
     (thanks to Haakon Innerdal for spotting this one)

 - Really fixed BUG 998 (disable the checking for installed but
   unpackaged files)

13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it


sql/sql_parse.cc:
  removed stale comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into narttu.mysql.fi:/my/mysql-4.0

Changes like this should be done to 4.1, not to a stable release


mysql-test/r/lowercase_table.result:
  Revert change of lower-case-table handling
mysql-test/t/lowercase_table.test:
  Revert change of lower-case-table handling
sql/sql_class.cc:
  Revert change of lower-case-table handling
sql/sql_class.h:
  Revert change of lower-case-table handling
sql/sql_parse.cc:
  Revert change of lower-case-table handling
sql/sql_table.cc:
  Revert change of lower-case-table handling
sql/sql_yacc.yy:
  Revert change of lower-case-table handling

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

sql/opt_range.cc:
  Fixes for out of memory conditions.