into build.mysql.com:/users/dlenev/mysql-4.0-certs

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


sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged

(Mostly code cleanups)


include/my_sys.h:
  Removed not used define
myisam/mi_check.c:
  Indentation change
mysql-test/t/rpl_insert_id.test:
  Add test if server supports innodb
mysys/mf_format.c:
  Remove QUOTE handling from fn_format()
  (fn_format() should not have anything to do with quoting things)
sql/log_event.cc:
  Removed some unnecessary casts (by changing functions to use const char *)
  Cleaned up some error messages to make them shorter and (hopefully) more readable.
  Fixed wrong format strings
  Restored 'thd->options' on error.
sql/mini_client.cc:
  Changed order of include files to remove compilation warning
sql/mysqld.cc:
  Add proper quoting of service arguments (don't use fn_format)
sql/slave.cc:
  Simple optimization and cleanup.
  Changed rewrite_db() and print_slave_db_safe() to use const char* to avoid casting of arguments when calling functions.
  Cleanup of some error messages.
sql/slave.h:
  Changed protypes to use const char *
sql/sql_acl.cc:
  Simple optimization
vio/viosslfactories.c:
  Changed order of include files to remove compilation warning

Build-tools/Bootstrap:
   - no need to create the make_win_src_distribution script in here - do
     it in the Makefile instead.
scripts/Makefile.am:
   - added make_win_src_distribution to bin_SCRIPTS, so it's automatically
     built
scripts/make_win_src_distribution.sh:
   - merge fixes (looks like CRLF problems)

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

into gcw.ath.cx:/home/greg/bk/mysql-4.0

  Aligned test with regenerated SSL certs
Many files:
  Regenerated expired certificates


SSL/cacert.pem:
  Regenerated expired certificates
SSL/client-cert.pem:
  Regenerated expired certificates
SSL/client-key.pem:
  Regenerated expired certificates
SSL/client-req.pem:
  Regenerated expired certificates
SSL/server-cert.pem:
  Regenerated expired certificates
SSL/server-key.pem:
  Regenerated expired certificates
SSL/server-req.pem:
  Regenerated expired certificates
mysql-test/t/openssl_1.test:
  Aligned test with regenerated SSL certs
mysql-test/r/openssl_1.result:
  Aligned test with regenerated SSL certs
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
sql/sql_acl.cc:
  Auto merged

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

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

Build-tools/Bootstrap:
  Add --win-dist option to create Windows source package
scripts/Makefile.am:
  Add make_win_src_distribution to CLEANFILES

scripts/Makefile.am:
  Add make_win_src_distribution to EXTRA_SCRIPTS

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

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

   Unfortunately the returned value of "hostname" is inconsistent on
   various platforms - some return the host name only, others return the
   FQDN by default. On Linux, one can use option "-f" to enable the output
   of the FQDN. Use it, if available.


scripts/mysql_install_db.sh:
   - try harder to obtain the FQDN with "hostname -f", if possible (BUG#897)

 - Fixed BUG#959 (libmysqld not being compiled properly)
 - Fixed BUG#998 (RPM build errors): added missing files to the
   distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
   mysql_fix_privilege_tables.1), removed "-n" from %install section.


support-files/mysql.spec.sh:
   - Fixed BUG#959 (libmysqld not being compiled properly)
   - Fixed BUG#998 (RPM build errors): added missing files to the
     distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
     mysql_fix_privilege_tables.1), removed "-n" from %install section.

sql/sql_select.cc:
  Fix the GCC compiler error introduced for the cast for VC++

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

- Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
for that.
- Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
SLAVE STATUS". Now these reset the errors.


mysql-test/r/rpl_loaddata.result:
  result update.
mysql-test/t/rpl_loaddata.test:
  Test that RESET SLAVE, START SLAVE and CHANGE MASTER all reset 
  Last_slave_error and Last_slave_errno (columns of SHOW SLAVE STATUS).
  We do it in this test because that's one of tests which have 
  an intentional query error on the slave.
sql/slave.cc:
  As we need TWICE the code to copy command-line options (--master-host etc)
  to mi (we already had it in init_master_info, but we also need it in RESET
  SLAVE to fix bug#985), I make a function of this code.
  And a function to reset Last_slave_error and Last_slave_errno (we need
  it in CHANGE MASTER, RESET SLAVE, and at the start of the SQL thread).
sql/slave.h:
  declarations for new functions.
sql/sql_repl.cc:
  copy --master-host etc to mi in RESET SLAVE, so that SHOW SLAVE STATUS
  shows correct information.

replicate-*-table rules which exclude 'mysql' tables
(e.g. replicate-wild-ignore-table=mysql.%).
This was already the behaviour for GRANT/REVOKE, I'm extending it to
SET PASSWORD because it seems very logical (the contrary seems illogical).
2 new tests:
- one to test if GRANT and SET PASSWORD are replicated
- one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
The 2nd is also a testcase for BUG#980.


sql/sql_acl.cc:
  Fix so that SET PASSWORD is not replicated by the slave if running with
  replicate-*-table rules which exclude 'mysql' tables
  (e.g. replicate-wild-ignore-table=mysql.%).
  This was already the behaviour for GRANT/REVOKE, I'm extending it to
  SET PASSWORD because it seems very logical (the contrary seems illogical).

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


sql/sql_acl.cc:
  Auto merged

tables_ok() does not ignore them. This fixes random bug #980.


sql/sql_acl.cc:
  Mark tables 'updating' so that tables_ok() does not ignore them;
  this fixes random bug #980.

the bug with 3.23.
ChangeSet@1.1416.113.1, 2003-03-22 15:22:59+01:00, guilhem@mysql.com
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
      Now it does not SEGV, but USER() is still badly replicated
      (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Don't segfault in USER() if thd->user == 0 (system thread).

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

  Fix assertion failure reported by Alex Kiernan when we compile with the SUN Forte Developer 7 C 5.4 compiler


innobase/log/log0log.c:
  Fix assertion failure reported by Alex Kiernan when we compile with the SUN Forte Developer 7 C 5.4 compiler

   Thanks to Alex Kiernan for the hint.

   for the patch

myisamchk.c:
  help text clarified
mi_check.c:
  allow one to "analyze" empty table :)


myisam/mi_check.c:
  allow one to "analyze" empty table :)
myisam/myisamchk.c:
  help text clarified

into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0

into mysql.com:/home/dlenev/src/mysql-4.0-bugfix

mysql-test/r/query_cache.result:
  test of many merged tales
mysql-test/t/query_cache.test:
  test of many merged tales
sql/sql_cache.h:
  query with merged tables can depend of more then 255 tables

ignorant about ssl_type attribute


sql/sql_acl.cc:
  Now acl_getroot() honors ssl_type attribute even if we compile without openssl
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted