BitKeeper/etc/logging_ok:
  auto-union
scripts/make_win_src_distribution.old:
  Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old
BUILD/compile-pentium-debug-max:
  Auto merged
BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
  Auto merged
BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Docs/Makefile.am:
  Auto merged
client/get_password.c:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/perror.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/log0recv.h:
  Auto merged
innobase/include/row0sel.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_extra.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisammrg/myrg_queue.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/flush.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/rpl000018.result:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/r/rpl_relayspace.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/fulltext_left_join.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000018.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/sel000100.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_format.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/uniques.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
vio/viosocket.c:
  Auto merged
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  merge
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  merge
acinclude.m4:
  Merge with 4.0 (openssl patch)
client/mysqlbinlog.cc:
  Merge with 4.0 in which we had added code from 4.1
  (We are basicly only using the 4.1 code here)
configure.in:
  Keep 4.1 file
heap/hp_open.c:
  merge with 4.0
include/my_base.h:
  merge with 4.0
include/my_global.h:
  merge with 4.0
include/mysqld_error.h:
  merge with 4.0
innobase/ha/ha0ha.c:
  merge with 4.0
  (Code should be same but we use indentaion from 4.0)
innobase/log/log0recv.c:
  merge with 4.0
libmysql/libmysql.c:
  Remove with 4.0 code that was ported from 4.1
libmysqld/lib_sql.cc:
  merge with 4.0
myisam/mi_open.c:
  Remove 4.0 specific code
myisam/myisamchk.c:
  merge with 4.0
myisammrg/myrg_rkey.c:
  merge with 4.0
mysql-test/r/alter_table.result:
  May need to be fixed after merge
mysql-test/r/create.result:
  May need to be fixed after merge
mysql-test/r/distinct.result:
  May need to be fixed after merge
mysql-test/r/drop.result:
  May need to be fixed after merge
mysql-test/r/fulltext.result:
  May need to be fixed after merge
mysql-test/r/func_set.result:
  May need to be fixed after merge
mysql-test/r/func_str.result:
  May need to be fixed after merge
mysql-test/r/func_test.result:
  May need to be fixed after merge
mysql-test/r/grant.result:
  May need to be fixed after merge
mysql-test/r/group_by.result:
  May need to be fixed after merge
mysql-test/r/handler.result:
  May need to be fixed after merge
mysql-test/r/heap.result:
  May need to be fixed after merge
mysql-test/r/innodb.result:
  May need to be fixed after merge
mysql-test/r/insert.result:
  May need to be fixed after merge
mysql-test/r/insert_select.result:
  May need to be fixed after merge
mysql-test/r/key_diff.result:
  May need to be fixed after merge
mysql-test/r/merge.result:
  May need to be fixed after merge
mysql-test/r/myisam.result:
  May need to be fixed after merge
mysql-test/r/order_by.result:
  May need to be fixed after merge
mysql-test/r/query_cache.result:
  May need to be fixed after merge
mysql-test/r/rpl_flush_log_loop.result:
  May need to be fixed after merge
mysql-test/r/rpl_loaddata.result:
  May need to be fixed after merge
mysql-test/r/rpl_log.result:
  May need to be fixed after merge
mysql-test/r/rpl_log_pos.result:
  May need to be fixed after merge
mysql-test/r/rpl_rotate_logs.result:
  May need to be fixed after merge
mysql-test/r/select.result:
  May need to be fixed after merge
mysql-test/r/union.result:
  May need to be fixed after merge
mysql-test/r/user_var.result:
  May need to be fixed after merge
mysql-test/t/alter_table.test:
  merge with 4.0
mysql-test/t/create.test:
  merge with 4.0
mysql-test/t/distinct.test:
  merge with 4.0
mysql-test/t/drop.test:
  merge with 4.0
mysql-test/t/flush.test:
  merge with 4.0
mysql-test/t/fulltext.test:
  merge with 4.0
mysql-test/t/func_set.test:
  merge with 4.0
mysql-test/t/func_str.test:
  merge with 4.0
mysql-test/t/func_test.test:
  merge with 4.0
mysql-test/t/grant.test:
  merge with 4.0
mysql-test/t/grant_cache.test:
  merge with 4.0
mysql-test/t/innodb.test:
  Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB
mysql-test/t/insert.test:
  merge with 4.0
mysql-test/t/insert_select.test:
  merge with 4.0
mysql-test/t/merge.test:
  merge with 4.0
mysql-test/t/query_cache.test:
  merge with 4.0
mysql-test/t/rpl_flush_log_loop.test:
  merge with 4.0
mysql-test/t/rpl_loaddata.test:
  merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
  merge with 4.0
mysql-test/t/select.test:
  merge with 4.0
mysql-test/t/symlink.test:
  merge with 4.0
mysql-test/t/union.test:
  merge with 4.0
mysys/charset.c:
  merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
  merge with 4.0 (Add quoting for some variables)
sql/field.h:
  merge with 4.0
sql/ha_innodb.cc:
  merge with 4.0
sql/item_cmpfunc.cc:
  merge with 4.0
sql/item_cmpfunc.h:
  merge with 4.0
sql/item_func.h:
  merge with 4.0
sql/item_strfunc.cc:
  merge with 4.0
  Fixed null handling with ELT()
sql/item_timefunc.h:
  merge with 4.0
sql/lex.h:
  merge with 4.0
sql/log.cc:
  merge with 4.0
sql/log_event.cc:
  Merge with 4.0
  Cleanups:
  - Indentation
  - #endif comments
  - Replace strmov() with *pos++= for two byte strings
  - Moved variable declarations to start of functions
  - Merged identical code (LOAD_EVENT)
  - Added casts when subtracting pointers
  Did a full diff between this and 4.0 to ensure that the file is correct after merge.
sql/log_event.h:
  merge with 4.0
sql/mysql_priv.h:
  merge with 4.0
sql/mysqld.cc:
  merge with 4.0
sql/repl_failsafe.cc:
  merge with 4.0
sql/set_var.cc:
  merge with 4.0
sql/set_var.h:
  merge with 4.0
sql/share/czech/errmsg.txt:
  merge with 4.0
sql/share/danish/errmsg.txt:
  merge with 4.0
sql/share/dutch/errmsg.txt:
  merge with 4.0
sql/share/english/errmsg.txt:
  merge with 4.0
sql/share/estonian/errmsg.txt:
  merge with 4.0
sql/share/french/errmsg.txt:
  merge with 4.0
sql/share/german/errmsg.txt:
  merge with 4.0
sql/share/greek/errmsg.txt:
  merge with 4.0
sql/share/hungarian/errmsg.txt:
  merge with 4.0
sql/share/italian/errmsg.txt:
  merge with 4.0
sql/share/japanese/errmsg.txt:
  merge with 4.0
sql/share/korean/errmsg.txt:
  merge with 4.0
sql/share/norwegian-ny/errmsg.txt:
  merge with 4.0
sql/share/norwegian/errmsg.txt:
  merge with 4.0
sql/share/polish/errmsg.txt:
  merge with 4.0
sql/share/portuguese/errmsg.txt:
  merge with 4.0
sql/share/romanian/errmsg.txt:
  merge with 4.0
sql/share/russian/errmsg.txt:
  merge with 4.0
sql/share/slovak/errmsg.txt:
  merge with 4.0
sql/share/spanish/errmsg.txt:
  merge with 4.0
sql/share/swedish/errmsg.txt:
  merge with 4.0
sql/share/ukrainian/errmsg.txt:
  merge with 4.0
sql/slave.cc:
  Merge + some indentation fixes
sql/slave.h:
  merge with 4.0
sql/sql_acl.cc:
  merge with 4.0
  Some end space removal to make it easier to do future merges
sql/sql_acl.h:
  merge with 4.0
sql/sql_cache.cc:
  merge with 4.0
sql/sql_class.h:
  merge with 4.0
sql/sql_handler.cc:
  merge with 4.0
sql/sql_lex.cc:
  merge with 4.0
sql/sql_lex.h:
  merge with 4.0
sql/sql_parse.cc:
  merge with 4.0
sql/sql_repl.cc:
  merge with 4.0
sql/sql_select.cc:
  merge with 4.0
sql/sql_table.cc:
  merge with 4.0
sql/sql_union.cc:
  Merge with 4.0
  Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later
sql/sql_yacc.yy:
  merge with 4.0
  Removed end space to make merge easier
vio/Makefile.am:
  merge with 4.0

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


BitKeeper/etc/logging_ok:
  auto-union
sql/item_func.cc:
  Auto merged

Build-tools/Bootstrap:
  Add --win-dist parameter to run make_win_src_distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


client/mysqldump.c:
  Auto merged

client/mysqldump.c:
  fixed bug with missing '\' in string constant

acinclude.m4:
  Fix for RedHat9 and openssl
sql/item_func.cc:
  Indentation changes
  Fix that -integer works as in 4.0

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

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

mysql-test/r/innodb.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

  Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task


mysql-test/r/union.result:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
mysql-test/t/union.test:
  A fix for a bug #978.
  
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql/sql_select.cc:
  Code clean-up
sql/sql_union.cc:
  Code clean-up

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

into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct

aligned with Sergey notes.


sql/records.cc:
  fix for bug #958 - big select with 
  count distinct and group by
  aligned with Sergey notes.

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

BitKeeper/etc/logging_ok:
  auto-union

CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
SELECT FIELD('ue',s1) FROM t1;
The above returned 0 in error.
Now 1 is returned.

CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
INSERT INTO t1 VALUES ('ue');
SELECT DISTINCT s1 FROM t1;

The above returned two rows in error.
Now it returns one row, in latin1_german2_ci:  Ü == ue

produced an error. This led to server crash in some cases, e.g.:
create table t7 (s1 char);
select * from t7
where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
= 'AA';

- 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.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

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).