BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

 should return a non empty one"
(see comments for the changed files for details).


mysql-test/r/ps.result:
  A test case for Bug#9777: tests results fixed.
mysql-test/t/ps.test:
  A test case for Bug#9777
sql/item.cc:
  A fix for Bug#9777: when creating a constant item from within 
  Item_int_with_ref::new_item, create the item by value, not by name.
  This should work with prepared statements placeholders.
  Item_int_with_ref is a special optimization case used
   when we compare datetime constants with datetime value.
  Converting the item to integer early is OK as it is in line
  with the purpose of Item_int_with_ref - to speed up comparison by 
  using integers.
  Minor cleanups.
sql/item.h:
  Declaration for Item_int_with_ref::new_item

into mysql.com:/Users/kent/mysql/cw/mysql-4.1

  Initial Metrowerks CodeWarrior compiler support
  new file


support-files/MacOSX/mwar-wrapper:
  Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
  Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
  Initial Metrowerks CodeWarrior compiler support

into hundin.mysql.fi:/home/jan/mysql-4.1

  Initial Metrowerks CodeWarrior compiler support


cmd-line-utils/libedit/config.h:
  Initial Metrowerks CodeWarrior compiler support
configure.in:
  Initial Metrowerks CodeWarrior compiler support
include/my_sys.h:
  Initial Metrowerks CodeWarrior compiler support
sql/sql_bitmap.h:
  Initial Metrowerks CodeWarrior compiler support
cmd-line-utils/readline/terminal.c:
  Initial Metrowerks CodeWarrior compiler support

into mysql.com:/home/cps/mysql/trees/mysql-5.0

into mysql.com:/opt/local/work/mysql-5.0-root

into mysql.com:/space/my/mysql-4.1-bug9444

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

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


support-files/mysql.server.sh:
  Auto merged

  Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
  (e.g. RHEL3/RHEL4)


support-files/mysql.server.sh:
  - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match
    the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)

into mysql.com:/opt/local/work/mysql-5.0-root


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

 records if prepared statements is used" (see comments to 
the changed files).


mysql-test/r/ps.result:
  Post-merge fix for Bug#9096: test results fixed.
mysql-test/r/type_datetime.result:
  Post-merge fix for Bug#9096: now we do better constants comparison,
  so the optimizer is able to guess from the index that we don't
  need to evaluate WHERE clause.
sql/item.cc:
  Post-merge fixes for Bug#9096: implement by-value comparison for
  new 5.0 DECIMAL type.
  Item_real is renamed to Item_float in 5.0
  Item_varbinary is renamed to Item_hex_string in 5.0
sql/item.h:
  Post-merge fixes for Bug#9096: declaration for Item_decimal::eq

into mysql.com:/home/jonas/src/mysql-5.0

  changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places


ndb/src/common/portlib/gcc.cpp:
  remove ndb __cxa_pure_virtual
ndb/src/common/util/new.cpp:
  remove "ndb" new/delete

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

AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061).


sql/ha_innodb.cc:
  Initial value for a auto_increment can now be set using ALTER TABLE
  AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
  change is backported from 5.0.

into hundin.mysql.fi:/home/jan/mysql-4.1

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

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

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

  Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287


mysql-test/r/ndb_restore.result:
  BUG#10287
mysql-test/t/ndb_restore.test:
  BUG#10287
ndb/test/src/NDBT_ResultRow.cpp:
  BUG#10287
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0


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

into mysql.com:/opt/local/work/mysql-4.1-9096-fresh


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged

records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).


mysql-test/r/ps.result:
  Test results for the test case for Bug#9096
mysql-test/t/ps.test:
  A short test case for Bug#9096 "select doesn't return all matched records if
   prepared statements is used". The is enough to reproduce the
  glitch in update_ref_and_keys causing the bug to occur.
sql/item.cc:
  Implement by-value equality evaluation of basic constants.
  This is needed to work with Item_param values. Until now
  Item_param was compared with other items by its name, which is always "?".
  The bug at hand showed up when an integer
  constant was created from one parameter marker (with value 200887 and
   name "?") and then compared by-name with another parameter marker
  (with value 860 and name "?"). True returned by this comparison resulted
  in a wrong table access method used to evaluate the query.
  Implement Item_param methods needed to emulate "basic constant" mode at 
  full.
sql/item.h:
  Change declaration of basic_const_item(): now it also widens its 
  argument from const Item * to Item * if the argument is a basic constant.
  Declare eq() for all basic constatns, as long as now they 
  are compared by value, not by name. Each constant needs its own
  comparison method.
  Declarations of Item_param methods needed to fully emulate 
  a basic constant when parameter value is set.
sql/item_func.cc:
  Fix wrong casts.

into mysql.com:/home/psergey/mysql-5.0-test-valgrind

into hundin.mysql.fi:/home/jan/mysql-4.1

into mysql.com:/home/psergey/mysql-5.0-test-valgrind


sql/sql_select.cc:
  Auto merged

  Return a value from innobase_repl_report_sent_binlog()


sql/ha_innodb.cc:
  Return a value from innobase_repl_report_sent_binlog()

mysql-test/r/query_cache.result:
  Update results
mysql-test/r/user_limits.result:
  Update results

mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Resolve merge of bug fix
scripts/mysql_fix_privilege_tables.sql:
  Resolve merge of bug fix

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean


extra/my_print_defaults.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

configure.in:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/query_cache.result:
  Mege results
mysql-test/t/lowercase_table.test:
  Merge tests
mysql-test/t/query_cache.test:
  Merge tests
mysys/default.c:
  Merge from 4.1
sql/sql_cache.cc:
  Merge
sql/sql_parse.cc:
  Merge from 4.1
sql/sql_table.cc:
  Merge
tests/mysql_client_test.c:
  Merge

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


sql/ha_blackhole.cc:
  Auto merged