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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  re-wrote secion about foreign keys
vio/test-ssl:
  no change

Docs/manual.texi:
  Merge gone bad

  Add a mirror in Belgium


Docs/manual.texi:
  Add a mirror in Belgium

configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

Docs/manual.texi:
  Updated section of how to change the socket file.
  Changelog for 3.23.43
include/merge.h:
  Fixed typo
include/my_pthread.h:
  Fixed bug for WIN32
include/myisam.h:
  Fixed typo
include/nisam.h:
  Fixed typo
sql/handler.h:
  Fixed typo
sql/sql_table.cc:
  Fixed typo
sql/unireg.cc:
  F

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

Docs/manual.texi:
  Updated information about mysql_insert_id()

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

Docs/manual.texi:
  Update for German sorting
configure.in:
  Don't make the German sort order default
myisam/mi_delete_all.c:
  Truncate files on DELETE FROM table_name to not get warnings when checking files
myisam/mi_search.c:
  Fix for multi-byte character sets.
sql/item_cmpfunc.cc:
  Use current character set when using STRCMP()
strings/ctype-latin1_de.c:
  F

handler.cc	If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause


sql/handler.cc:
  If CREATE TABLE fails for an InnoDB table, do not put the OS error number to the error message, because it is not the cause

ha_innobase.cc	mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast


sql/ha_innobase.cc:
  mean_rec_length was set to a too small value for > 4 GB tables because of a wrong typecast

configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

Optimized remove of key when using internal cursor in BDB tables.


mysql-test/r/bdb.result:
  Test for LOCK bug
mysql-test/t/bdb.test:
  Test for LOCK bug
sql/ha_berkeley.cc:
  Fix bugs when using LOCK TABLES
  Optimized remove of key when using internal cursor
sql/ha_berkeley.h:
  Initilize of changed_rows
sql/lock.cc:
  Fix for BDB tables

Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98


Docs/manual.texi:
  Removed wrong info
bdb/os_win32/os_rename.c:
  Fix for windows 98
configure.in:
  Better options for MAC OS X
include/dbug.h:
  Fix DBUG_ASSERT()
mysys/thr_lock.c:
  More DBUG messages
sql/ha_berkeley.cc:
  Use cursor in remove_key
sql/lock.cc:
  Fix possible problem when pre-unlocking tables in SELECT
sql/sql_select.cc:
  More DBUG messages
sql/violite.c:
  Fix DBUG messages

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added more information to MySQL comparison

sql-bench/test-create.sh:
  Made --small-test a bit faster
sql/ha_innobase.cc:
  Cleanup memory at exit
sql/mysqld.cc:
  Remove debug notes at shutdown

strings/ctype-latin1_de.c:
  Bug fixes:  basically, several cases were being handled totally wrong.
  
  The code is also cleaned up a little.

configure.in:
  Only allow --with-pstack on Linux x86
mysql-test/t/merge.test:
  Add test of using db.tablename in UNION()
mysys/mf_qsort.c:
  Fix when using purify
mysys/my_dup.c:
  Cleanup
mysys/raid.cc:
  Cleanup
sql/gen_lex_hash.cc:
  Smaller array
sql/ha_innobase.cc:
  Remove warnings
sql/mysqld.cc:
  Remove not used option from --help
sql/sql_class.h:
  Cleanup

  Fix Danish mirror contact


Docs/manual.texi:
  Fix Danish mirror contact

  Fix danish mirror contact


Docs/manual.texi:
  Fix danish mirror contact

mysql-test/mysql-test-run.sh:
  Make it work even if the character set used isn't compiled in to
  mysqld.
  
  Change the character set from latin1 to latin1_de.

configure.

sql/share/charsets/Index:
  Add latin1_de character set.

    Remove extra link_sources target, which was not being used
    (and was incorrect).

ctype-latin1_de.c
    BitKeeper file /home/tim/my/4/strings/ctype-latin1_de.c


libmysql/Makefile.shared:
  Remove extra link_sources target, which was
  not being used (and was incorrect).

Docs/manual.texi:
  Added description of C thread functions
sql-bench/test-create.sh:
  Faster --fast option

sql/handler.cc:
  Change the parameter name of default-table-type from INNOBASE to INNODB

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  cleanup
mysql-test/mysql-test-run.sh:
  Move traces to 'log' with other log files

Docs/manual.texi:
  Mirror maintenance

Docs/manual.texi:
  Change-over to new Primary Mirror; Small mirror fix-ups

libmysql/libmysql.c:
  Remove duplicated define
sql/log_event.cc:
  Portability fix

tools/mysqlmanager.c:
  more work

data0data.c	Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened


innobase/data/data0data.c:
  Fix an assertion failure in rem0rec.c line 195 when a > 8000 byte row is updated and an internally stored field shortened