into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

   (several users reported crashes, even when not using RAID) (see bug #346)

Changed handing of priv_host to fix bug in FLUSH PRIVILEGES


libmysqld/lib_sql.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
myisam/mi_rkey.c:
  Fix reference to not initialized memory
sql/sql_acl.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_acl.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_class.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/sql_parse.cc:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
sql/unireg.h:
  Changed handing of priv_host to fix bug in FLUSH PRIVILEGES

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

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

mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

mysql-test/r/innodb.result:
  fixing result
mysql-test/t/innodb.test:
  fixing test
sql/sql_base.cc:
  committing a fix in order to pull new stuff

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