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

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

   (General code cleanup, use the GRANT statement instead of updating
   the privilege tables directly, added option to revoke privileges)

  Print the failing assertion if it fails; helps to analyze bug reports


innobase/include/ut0dbg.h:
  Print the failing assertion if it fails; helps to analyze bug reports

strings/ctype-tis620.c:
  thai2sortable code optimized
  all the file formatted with company standards

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

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

   ANALYZE TABLE)


BitKeeper/etc/ignore:
  Added support-files/MacOSX/ReadMe.txt to the ignore list

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

  Don't allow access outside the string


strings/ctype-tis620.c:
  Don't allow access outside the string

   instead of being an individual file to avoid redundancy


BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd:
  Delete: support-files/MacOSX/ReadMe.txt
Docs/Makefile.am:
   - Generate the MacOS ReadMe.txt from the manual
support-files/MacOSX/Makefile.am:
   - Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated

include/my_pthread.h:
  Consolidated NetWare pthread_exit() changes.
mysys/mf_path.c:
  NetWare needs a semicolon path delimiter.
mysys/my_pthread.c:
  Consolidated NetWare pthread_exit() changes.
sql/mini_client.cc:
  Modified to match my_connect().
sql/mysqld.cc:
  Consolidated NetWare pthread_exit() changes.
sql/slave.cc:
  Consolidated NetWare pthread_exit() changes.
sql/sql_load.cc:
  Stat properites should not be checked here on NetWare.

netware/mysql.xdc:
  Change mode to -rw-rw-r--
netware/BUILD/compile-AUTOTOOLS:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-linux-tools:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-END:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-START:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-all:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-debug:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/compile-netware-standard:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwasmnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwccnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/mwldnlm:
  Turned on error checking in all NetWare build scripts.
netware/BUILD/nwbootstrap:
  Add target path suffix

  When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0


sql/ha_innodb.cc:
  When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0

  Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown


innobase/srv/srv0srv.c:
  Make sure we do not do insert buffer merge in fast shutdown even if there is some buglet which increments srv_activity_counter during a shutdown

  Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient


innobase/srv/srv0srv.c:
  Make buffer pool flush batches bigger as that may save some time if fsync is very inefficient

  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table


sql/ha_innodb.cc:
  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table
sql/ha_innodb.h:
  Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table

mysql-test/r/select_safe.result:
  Updated results
mysql-test/t/select_safe.test:
  Added test for SQL_BIG_SELECTS
sql/set_var.cc:
  Fixed bug in SQL_BIG_SELECTS
sql/share/czech/errmsg.txt:
  Updated error messages
sql/share/danish/errmsg.txt:
  Updated error messages
sql/share/dutch/errmsg.txt:
  Updated error messages
sql/share/english/errmsg.txt:
  Updated error messages
sql/share/estonian/errmsg.txt:
  Updated error messages
sql/share/french/errmsg.txt:
  Updated error messages
sql/share/german/errmsg.txt:
  Updated error messages
sql/share/greek/errmsg.txt:
  Updated error messages
sql/share/hungarian/errmsg.txt:
  Updated error messages
sql/share/italian/errmsg.txt:
  Updated error messages
sql/share/japanese/errmsg.txt:
  Updated error messages
sql/share/korean/errmsg.txt:
  Updated error messages
sql/share/norwegian-ny/errmsg.txt:
  Updated error messages
sql/share/norwegian/errmsg.txt:
  Updated error messages
sql/share/portuguese/errmsg.txt:
  Updated error messages
sql/share/romanian/errmsg.txt:
  Updated error messages
sql/share/russian/errmsg.txt:
  Updated error messages
sql/share/slovak/errmsg.txt:
  Updated error messages
sql/share/spanish/errmsg.txt:
  Updated error messages
sql/share/swedish/errmsg.txt:
  Updated error messages
sql/share/ukrainian/errmsg.txt:
  Updated error messages

(There was a problem on some AMD system when the floating point precision wasn't accurate enough)


mysql-test/r/group_by.result:
  new test result
mysql-test/t/group_by.test:
  Changed test slightly to make it repeatable

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0

sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
support-files/my-huge.cnf.sh:
  Added query_cache_size
support-files/my-large.cnf.sh:
  Added query_cache_size

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

from Monty.