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

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

into oak.local:/home/kostja/mysql/mysql-4.0-rightnow

mysql-test/r/select.result:
  unnecessary info removed from result
mysql-test/t/select.test:
  unnecessary info don't get into result any more

myisam/mi_check.c:
  More explicit error messages
myisam/mi_dynrec.c:
  More comments

into account to increase the cost of FULL SCAN


sql/sql_select.cc:
  more accurate FULL SCAN cost estimation:
  join buffer cache usage/not usage is taken
  into account to increase the cost

into oak.local:/home/kostja/mysql/mysql-4.0-rightnow

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

Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999


BitKeeper/deleted/.del-.fgl~c7d07ad3164a2b48:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~cfedc4432bdca9d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~aa4045acaf293d36:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~89b2af9ae5059f62:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~46b97f4278325e8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl
BitKeeper/deleted/.del-Default.fgl~b9558db492415763:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~8207e98594fe0bee:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~dbd86cfa42705734:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~1c366d3557e024bf:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Default.rge~d816fd8cef3f06d5:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-MySQL 3.23.XX-GPL.ipr~3116ab4aa52a6b44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr
BitKeeper/deleted/.del-Servers.fgl~c809b9515fd51041:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~f8ba4a87c5dd90a9:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~cb1fefacb45841a:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~6946c5065a12572d:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~33bf58c825ff3ac8:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~8cc4dee41dcb733f:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul
BitKeeper/deleted/.del-Build.tsb~43a1c0d54abb5a44:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~4bc5f71f8f0bd822:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~8b61f648197f5de3:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~1e85725234603bfe:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.tsb~5344bdc39c0e9884:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-infolist.txt~58b203247936d266:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-value.shl~98c2851db96b919e:
  Delete: VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-.fgl~cac6624e1ac6ee1d:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl
BitKeeper/deleted/.del-Clients and Tools.fgl~826a8e3f651af365:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~1da6505528200d5e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~466762fdf65e1477:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~45b9e847fa4da131:
  Delete: VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.fgl~a86ce70180b5aba4:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl
BitKeeper/deleted/.del-Development.fgl~ca1458874a3fef81:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl
BitKeeper/deleted/.del-Default.rge~2218627c2a901409:
  Delete: VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~cf0ac866737a5c7d:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~31e527d126c42d90:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-MySQL 3.23.com.ipr~eb817edea43c6e6e:
  Delete: VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr
BitKeeper/deleted/.del-Servers.fgl~36147accb82f759:
  Delete: VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~688e9d3ec362ec34:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~85f07a856a69a722:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino
BitKeeper/deleted/.del-Default.shl~a02a9093c2b6b0d9:
  Delete: VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl
BitKeeper/deleted/.del-SETUP.BMP~77e20d86bceb4903:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP
BitKeeper/deleted/.del-Setup.ins~ab68efc133d8411e:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~2f09140119879bc6:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~14510a994d515f19:
  Delete: VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul
BitKeeper/deleted/.del-infolist.txt~ee370f4771c83a97:
  Delete: VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-Build.tsb~f3be7d512e6d5b74:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~e18d3f10bef97a28:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~e74dbc7688d4019a:
  Delete: VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~718b5b291d5ff04d:
  Delete: VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl
BitKeeper/etc/ignore:
  Added hardcopy.0 to the ignore list
VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add VERSION tags for automation
VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl:
  Add VERSION tags for automation
scripts/make_win_src_distribution.sh:
  Improved unix to DOS conversion, add processing of version tags in InstallShield files

to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.


mysql-test/r/distinct.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/join_outer.result:
  Fixed test suite: now full scan is used
  less often
mysql-test/r/select_safe.result:
  Fixed test suite: now full scan is used
  less often

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

SSL/cacert.pem:
  Regenerated expired CA certificate
SSL/client-cert.pem:
  Signed client certificate after regenerating CA certificate
SSL/server-cert.pem:
  Signed server certificate after regenerating CA certificate

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

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

fault). Fix is just initializing "host" (and "user") with 0, not a string.


client/mysqlbinlog.cc:
  command-line arguments should be initialized like in mysqldump.cc to not cause
  segfault.

   C compiler barf

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

 - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.


configure.in:
   - removed "-traditional-cpp" from the darwin6 compile flags, as it broke
     compilation with gcc-3.3 and does not seem to be required in general.
libmysqld/examples/Makefile.am:
   - make sure to link mysqltest.c with a C++ compiler, as the embedded server
     library (libmysqld.a) includes C++ code.

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

  Fix buglets in previous push


innobase/row/row0sel.c:
  Fix buglets in previous push

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

  Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised


innobase/row/row0sel.c:
  Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised

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

Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  test that LOAD DATA FROM MASTER does not drop databases,
  but rather table by table, thus preserving non-replicated tables.
  Test that LOAD DATA FROM MASTER reports the error when a table could not
  be dropped (system's "permission denied" for example).
  Test that LOAD TABLE FROM MASTER reports the error when the table already exists.
sql/repl_failsafe.cc:
  * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
  database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
  * If a db matches replicate_*_db rules, we don't drop/recreate it because this
  could drop some tables in this db which could be slave-specific. Instead,
  we do a CREATE DATABASE IF EXISTS, and we will drop each table which has
  an equivalent on the master, table-by-table.
sql/slave.cc:
  New argument to drop the table in create_table_from_dump() 
  (LOAD TABLE/DATA FROM MASTER are the only places where this function is used).
  This is needed because LOAD DATA FROM MASTER does not drop the database anymore.
  The behaviour when the table exists is unchanged: LOAD DATA silently replaces
  the table, LOAD TABLE gives error.
sql/slave.h:
  new argument to drop the table in fetch_master_table
sql/sql_parse.cc:
  do not drop the table in LOAD TABLE FROM MASTER (this behaviour is already
  true; but changes in LOAD DATA FROM MASTER made the argument needed).

   use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)


scripts/mysql_install_db.sh:
   - Added option "--skip-name-resolve" to use the local machine's IP address
     instead of the host name when building the initial grant tables if
     "skip-name-resolve" has been specified in my.cnf (Thanks to Jeremy 
     Zawodny for the patch)

 - tagged ChangeSet 1.1556 as mysql-4.0.15


configure.in:
   - Bumped up version number: 4.0.15 -> 4.0.16

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