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

 - the preferred mailing list is internals@ not dev-public@
   (this is a public document)
 - Rather use the 4.1 tree for new development (4.0 is frozen)


BitKeeper/etc/ignore:
  Added Docs/internals.html Docs/internals.pdf Docs/internals.txt Docs/internals_toc.html to the ignore list

Monty; minor changes only.

Monty; clarified differences between the MySQL library 
directories.

from Monty; minor changes only.

Monty; new description of /man subdirectory

Monty; one minor change, plus addition of how HEAP works.

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

Monty; added additional description of MySQL's three types 
of record formats.


Docs/internals.texi:
  Updated PeterG's internals documentation per comments from 
  Monty; added additional description of MySQL's three types
  of record formats.

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

CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

Docs/internals.texi:
  Moved code guidelines first
  Fixed texinfo nodes & menus
VC++Files/mysql.dsw:
  Added missing dependency

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

   up-to-date anyway)

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

include/my_global.h:
  Fixed wrong #ifdef
include/violite.h:
  Fix to remove compiler warning
libmysqld/libmysqld.c:
  Fix to remove compiler warning
myisam/sort.c:
  Fix to remove compiler warning
myisammrg/myrg_extra.c:
  Fix to remove compiler warning
vio/viossl.c:
  Fix to remove compiler warning

  (the results are nondeterministic and provide different output on 32bit
  and 64bit architectures)


mysql-test/r/innodb.result:
   - removed two EXPLAIN SELECT results because the output is nondeterministic
     (the result was different on 64bit platforms)
mysql-test/t/innodb.test:
   - removed two EXPLAIN SELECT tests because the results are nondeterministic
     (the result was different on 64bit platforms)

Docs/internals.texi:
   - fixed some structural errors

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

Fix for grant bug with SELECT *


include/my_global.h:
  Fix for openssl on Solaris
sql/item_strfunc.cc:
  Fix for openssl on Solaris
sql/sql_acl.cc:
  Indentation cleanup
sql/sql_base.cc:
  Fix for grant bug with SELECT *
sql/sql_parse.cc:
  Added comment
tests/grant.pl:
  New grant test for SELECT *
tests/grant.res:
  new grant results

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


sql/mini_client.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged

mysys/my_pthread.c:
  Move #undef directive out of function

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


sql/ha_innodb.cc:
  Auto merged

Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97)


VC++Files/libmysql/libmysql.dsp:
  Added new source files
myisam/mi_key.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_range.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_rkey.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_search.c:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/mi_test2.c:
  Fixed printf statements
myisam/myisamdef.h:
  Fixed problem when comparing a key for a multi-byte-character set.
myisam/sort.c:
  Fixed printf statements
mysql-test/r/ctype_latin1_de.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/repair.result:
  New test results
mysql-test/r/rpl_alter.result:
  New test results
mysql-test/t/ctype_latin1_de-master.opt:
  --new is needed to get 0x... strings to work properly
mysql-test/t/ctype_latin1_de.test:
  New test for latin1_de
mysql-test/t/repair.test:
  Test of USE_FRM and HEAP tables
sql/field.cc:
  Fixed problem when comparing a key for a multi-byte-character set.
sql/item.cc:
  Use 0x.... as strings if 'new' mode
sql/item.h:
  Use 0x.... as strings if 'new' mode
sql/mysqld.cc:
  Don't report -max on windows when InnoDB is enabled.
sql/sql_analyse.cc:
  Removed unused variable
sql/sql_insert.cc:
  Removed debug message
sql/sql_repl.cc:
  Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
sql/sql_select.cc:
  Fix for row numbers in EXPLAIN
sql/sql_table.cc:
  Fix that USE_FRM works for all table types (without strange errors)
sql/sql_yacc.yy:
  Removed compiler warnings.

  Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error


sql/ha_innodb.cc:
  Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error
innobase/trx/trx0trx.c:
  Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error
innobase/include/trx0trx.h:
  Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error

Monty; minor changes only.

minor changes only.

Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/rpl_alter.test:
  Auto merged
mysys/charset.c:
  Auto merged
sql/log_event.cc:
  Auto merged
mysql-test/r/join.result:
  Merge with 3.23
mysql-test/t/join.test:
  Merge with 3.23
sql/ha_innodb.cc:
  Merge with 3.23;  Set innobase_flush_log_at_trx_commit to 1 by default
sql/log_event.h:
  Merge with 3.23; Fix problem with timestamp on 64 bit systems
sql/mini_client.cc:
  Use local version
sql/mysqld.cc:
  Reserve alarms for up to 10 slave threads
sql/slave.cc:
  Use local version
sql/sql_list.h:
  Use local version

  fflush stderr after startup


innobase/srv/srv0start.c:
  fflush stderr after startup

Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)


acinclude.m4:
  Fix for -fbranch-probabilites
configure.in:
  Fix for -fbranch-probabilites
myisam/mi_open.c:
  Give error instead of writing to stderr (Which user can't see)
mysql-test/r/join.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/join_outer.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/r/select.result:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
mysql-test/t/join.test:
  Update results after change to NATURAL/LEFT/RIGHT JOIN
sql/item_strfunc.cc:
  Fix for LEFT/RIGHT/MID with multi-byte-character sets
sql/mysqld.cc:
  Fix for new bison 1.875 (Wrong error text message when one got syntax error)
sql/sql_class.cc:
  Don't show port in SHOW PROCESSLIST for system threads
sql/sql_insert.cc:
  max_insert_delayed_threads now works as documented.
  delayed_insert_timeout now works on Linux
sql/sql_parse.cc:
  Added comment
sql/sql_select.cc:
  Fix problem with ORDER BY being discarded and results returned un-sorted
sql/sql_yacc.yy:
  Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
  using many joined tables.

sql/mysqld.cc:
  Safety fix.

into hundin.mysql.fi:/home/igor/dev/mysql-4.0

sql/sql_insert.cc:
  fixed incorrect number of affected rows in REPLACE...SELECT...
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

   Fixed bug 263
order_by.test:
  Fixed bug 263


mysql-test/t/order_by.test:
  Fixed bug 263
mysql-test/r/order_by.result:
   Fixed bug 263
sql/filesort.cc:
   Fixed bug 263

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