BitKeeper/etc/ignore:
  Added =6 to the ignore list
include/mysqld_error.h:
  Error message for no-mixing of table types..
sql/mysql_priv.h:
  New option
sql/mysqld.cc:
  New option
sql/share/english/errmsg.txt:
  Error message for no-mixing of table types..
sql/sql_base.cc:
  Checking of the mixing of table types
sql/sql_parse.cc:
  some fixes

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  merged
sql/mini_client.cc:
  merged
sql/mysqld.cc:
  merged
sql/sql_repl.cc:
  merged

into mysql.sashanet.com:/home/sasha/src/bk/mysql

sql/mini_client.cc:
  alarm around mc_mysql_connect()
sql/mysqld.cc:
  move end_slave() to the earlier part of shutdown
sql/sql_repl.cc:
  retry thr_alarm_kill() in case slave thread missed the signal in SLAVE STOP

Docs/manual.texi:
  Changelog

  Fixed contributed software link


Docs/manual.texi:
  Fixed contributed software link

  Added mirror in Hong Kong


Docs/manual.texi:
  Added mirror in Hong Kong
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/sync/sync0sync.c:
  This inline assmebly does not compile on gcc-2.96 and Intel: remove it

New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.


include/global.h:
  Remove warning on Linux Alpha
include/mysql_com.h:
  Move some C variables inside extern "C" block.
include/mysqld_error.h:
  New error mesages
myisam/mi_write.c:
  cleanup
mysql-test/r/select.result:
  Fix because of table lists now always has a database argument.
mysql-test/r/type_datetime.result:
  Test for bug with datetime and where optimization
mysql-test/r/union.result:
  Updated result
mysql-test/t/type_datetime.test:
  New test for datetime
mysql-test/t/union.test:
  More testing of error conditions
sql/item_sum.cc:
  Remove warnings on Linux Alpha
sql/item_sum.h:
  Cleanup
sql/lock.cc:
  Cleaned up global lock handling
sql/log_event.cc:
  Removed default arguments from declarations (not allowed in cxx)
sql/mysql_priv.h:
  New prototypes
sql/mysqld.cc:
  Fix for global locks
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.txt:
  New errors
sql/share/danish/errmsg.txt:
  New errors
sql/share/dutch/errmsg.txt:
  New errors
sql/share/english/errmsg.txt:
  New errors
sql/share/estonian/errmsg.txt:
  New errors
sql/share/french/errmsg.txt:
  New errors
sql/share/german/errmsg.txt:
  New errors
sql/share/greek/errmsg.txt:
  New errors
sql/share/hungarian/errmsg.txt:
  New errors
sql/share/italian/errmsg.txt:
  New errors
sql/share/japanese/errmsg.txt:
  New errors
sql/share/korean/errmsg.txt:
  New errors
sql/share/norwegian-ny/errmsg.txt:
  New errors
sql/share/norwegian/errmsg.txt:
  New errors
sql/share/polish/errmsg.txt:
  New errors
sql/share/portuguese/errmsg.txt:
  New errors
sql/share/romanian/errmsg.txt:
  New errors
sql/share/russian/errmsg.txt:
  New errors
sql/share/slovak/errmsg.txt:
  New errors
sql/share/spanish/errmsg.txt:
  New errors
sql/share/swedish/errmsg.OLD:
  New errors
sql/share/swedish/errmsg.txt:
  New errors
sql/sql_acl.cc:
  Use thd->host_or_ip
sql/sql_class.cc:
  Use new global lock code
sql/sql_class.h:
  host_or_ip
sql/sql_db.cc:
  host_or_ip
sql/sql_delete.cc:
  Use now global lock code
sql/sql_lex.h:
  Cleanup of not used states and variables
sql/sql_parse.cc:
  Use now global locks.
  Made UNION code more general.
  Change to use thd->hosts_or_ip.
  TABLE_LIST now always has 'db' set.
sql/sql_repl.cc:
  Portability fixes.
  Changed wrong usage of my_vsnprintf -> my_snprintf
sql/sql_select.cc:
  Changes for UNION
sql/sql_show.cc:
  Cleanup
sql/sql_union.cc:
  Handle 'select_result' outside of mysql_union().
sql/sql_yacc.yy:
  Fixes for union

client/mysqlbinlog.cc:
  #include <my_pthread.h> before thr_alarm.h

Docs/manual.texi:
  Updated InnoDB section to reflect rel. .41

into mysql.sashanet.com:/home/sasha/src/bk/mysql

Replaced @strong{MySQL AB} with MySQL AB

row0sel.c	Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT
srv0start.c	Allow drive name followed by a ':' in a data file path
ha_innobase.cc	Allow drive name followed by a ':' in a data file path


sql/ha_innobase.cc:
  Allow drive name followed by a ':' in a data file path
innobase/srv/srv0start.c:
  Allow drive name followed by a ':' in a data file path
innobase/row/row0sel.c:
  Fix a memory freeing bug when a row which contains an externally stored long field in the middle of the row is fetched in a SELECT

client/mysqltest.c:
  Made mysqltest compatible with 3.23
sql/slave.cc:
  Marked removable code
vio/viossl.c:
  change to use DBUG_ASSERT

include/mysqld_error.h:
  Fix error messages
mysql-test/t/fulltext.test:
  Fixed wrong error numbers
mysql-test/t/union.test:
  Update error numbers after merge with 3.23
sql/share/czech/errmsg.txt:
  Fix of merge
sql/share/danish/errmsg.txt:
  Updated error messages from 3.23
sql/share/dutch/errmsg.txt:
  Updated error messages from 3.23
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Fix of merge
sql/share/french/errmsg.txt:
  Fix of merge
sql/share/german/errmsg.txt:
  Fix of merge
sql/share/greek/errmsg.txt:
  Fix of merge
sql/share/hungarian/errmsg.txt:
  Fix of merge
sql/share/italian/errmsg.txt:
  Fix of merge
sql/share/japanese/errmsg.txt:
  Fix of merge
sql/share/korean/errmsg.txt:
  Fix of merge
sql/share/norwegian-ny/errmsg.txt:
  Fix of merge
sql/share/norwegian/errmsg.txt:
  Fix of merge
sql/share/polish/errmsg.txt:
  Fix of merge
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Fix of merge
sql/share/russian/errmsg.txt:
  Fix of merge
sql/share/slovak/errmsg.txt:
  Fix of merge
sql/share/spanish/errmsg.txt:
  Fix of merge
sql/share/swedish/errmsg.txt:
  Fix of merge

mysql-test/t/union.test:
  A test case for :
  
  CREATE TABLE .. SELECT .... UNION SELECT ... UNION SELECT .....
  
  and
  
  INSERT INTO ... SELECT .... UNION SELECT ... UNION SELECT ....
  
  Monty, please let me know what changes do you want me to make. 
  I could not make both in the same function, as insert requires
  that table is open.
  
  Let me know what changes to make before I plunge into:
  
  EXPLAIN SELECT ... UNION ... SELECT ......

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

BitKeeper/etc/ignore:
  Added innobase/conftest.s1 innobase/conftest.subs sql/sql_select.cc.orig to the ignore list

 (wrong error code) but I'll push it so that Sergei could clean up
 my merge


include/mysqld_error.h:
  fixed typo
mysql-test/r/order_by.result:
  updated result for merged test
sql/Makefile.am:
  put back sql_union.cc lost during merge
sql/mysql_priv.h:
  restored variables lost in the merge
sql/mysqld.cc:
  put back lost variable declarations
sql/share/czech/errmsg.txt:
  merge fix
sql/share/danish/errmsg.txt:
  merge fix
sql/share/dutch/errmsg.txt:
  merge fix
sql/share/english/errmsg.txt:
  merge fix
sql/share/estonian/errmsg.txt:
  merge fix
sql/share/french/errmsg.txt:
  merge fix
sql/share/german/errmsg.txt:
  merge fix
sql/share/greek/errmsg.txt:
  merge fix
sql/share/hungarian/errmsg.txt:
  merge fix
sql/share/italian/errmsg.txt:
  merge fix
sql/share/japanese/errmsg.txt:
  merge fix
sql/share/korean/errmsg.txt:
  merge fix
sql/share/norwegian-ny/errmsg.txt:
  merge fix
sql/share/norwegian/errmsg.txt:
  merge fix
sql/share/polish/errmsg.txt:
  merge fix
sql/share/portuguese/errmsg.txt:
  merge fix
sql/share/romanian/errmsg.txt:
  merge fix
sql/share/russian/errmsg.txt:
  merge fix
sql/share/slovak/errmsg.txt:
  merge fix
sql/share/spanish/errmsg.txt:
  merge fix
sql/share/swedish/errmsg.txt:
  merge fix
sql/sql_acl.cc:
  merge fix

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql-bench/Makefile.am:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
Docs/manual.texi:
  merge
include/mysql_com.h:
  merge
include/mysqld_error.h:
  merge
mysql-test/install_test_db.sh:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/share/czech/errmsg.txt:
  merge
sql/share/danish/errmsg.txt:
  merge
sql/share/dutch/errmsg.txt:
  merge
sql/share/english/errmsg.txt:
  merge
sql/share/estonian/errmsg.txt:
  merge
sql/share/french/errmsg.txt:
  merge
sql/share/german/errmsg.txt:
  merge
sql/share/greek/errmsg.txt:
  merge
sql/share/hungarian/errmsg.txt:
  merge
sql/share/italian/errmsg.txt:
  merge
sql/share/japanese/errmsg.txt:
  merge
sql/share/korean/errmsg.txt:
  merge
sql/share/norwegian-ny/errmsg.txt:
  merge
sql/share/norwegian/errmsg.txt:
  merge
sql/share/polish/errmsg.txt:
  merge
sql/share/portuguese/errmsg.txt:
  merge
sql/share/romanian/errmsg.txt:
  merge
sql/share/russian/errmsg.txt:
  merge
sql/share/slovak/errmsg.txt:
  merge
sql/share/spanish/errmsg.txt:
  merge
sql/share/swedish/errmsg.txt:
  merge
sql/sql_base.cc:
  merge
sql/sql_table.cc:
  merge

into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

client/mysqlbinlog.cc:
  remove unused variables
sql/log_event.h:
  fix bad merge

into mysql.sashanet.com:/home/sasha/src/bk/mysql


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqlbinlog.cc:
  Auto merged

Docs/manual.texi:
  Changelog

BitKeeper/etc/ignore:
  auto-union

BitKeeper/deleted/.del-rpc_server_ext.h~952741fb85de2b80:
  Delete: bdb/include/rpc_server_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~85436ca9b5691338:
  Delete: bdb/include/rpc_client_ext.h
BitKeeper/etc/ignore:
  added bdb/include/rpc_client_ext.h

BitKeeper/etc/ignore:
  added include/widec.h

BitKeeper/etc/ignore:
  added */*_pure_*warnings
BUILD/compile-solaris-sparc:
  Optimized build for ultrasparc
sql/mysqld.cc:
  Made SIGTERM safer for Solaris as it sometimes delivered a not catched
  signal during shutdown

scripts/mysqldumpslow.sh:
  Handling of strings with \ and double ''
sql/mysqlbinlog.cc:
  Fixed type

There is now a mysql_server_init() function which needs to be
called at the beginning of the program (and _end() for the end
of the program).  This routine handles argument parsing for the
embedded server.

Use the embedded version of mysql_load_file() (ignore the LOCAL
argument, since the client and server are the same program).

There are now mysql_thread_init/end() functions for the client
to use in a multi-threaded app.  They are just wrappers for
my_thread_init/end().



BitKeeper/deleted/.del-README~434e9cae5fa9a4c4:
  Delete: libmysqld/README
libmysqld/lib_load.cc:
  minor cleanup
include/mysql.h:
  add mysql_server/thread_init/end()
libmysql/libmysql.c:
  add mysql_server/thread_init/end()
libmysqld/lib_sql.cc:
  add mysql_server/thread_init/end()
libmysqld/libmysqld.c:
  add mysql_server/thread_init/end()
sql/mysqld.cc:
  allow get_options() to be called more than once
libmysqld/Makefile.am:
  use lib_load.cc instead of sql_load.cc
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  new test case
mysql-test/r/innodb.result:
  Fixed result

BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0flu.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Will merge later..