into polly.local:/home/kaa/src/mysql-5.0

server-tools/instance-manager/mysql_connection.cc:
  use enum value instead of extern const in array definition
server-tools/instance-manager/priv.cc:
  added a comment to remind of enum value in mysql_connection.cc

  Put a sensible value of thread id and process no to a background rollback transaction


innobase/trx/trx0roll.c:
  Put a sensible value of thread id and process no to a background rollback transaction

  Fix the rollback progress printout in crash recovery


innobase/trx/trx0roll.c:
  Fix the rollback progress printout in crash recovery

  Print progress of background rollback of transactions with more than 1000 undo log entries
srv0start.c, trx0roll.c, log0recv.c, trx0roll.h:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly


innobase/include/trx0roll.h:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/log/log0recv.c:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/srv/srv0start.c:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/trx/trx0roll.c:
  Print progress of background rollback of transactions with more than 1000 undo log entries

  Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function


innobase/include/rem0rec.ic:
  Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function

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


sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged

libmysql/libmysql.c:
  More post-review fixes for truncation patch:
  - use my_strtoll10
  - workaround for Intel FPU executive precision feature
  - one case when we didn't report possible truncation fixed.
strings/my_strtoll10.c:
  Fix a comment.
tests/client_test.c:
  One more test now passes

Solaris doesn't define INADDR_NONE macro. This resulted in compilation
failure. (advanced fix)


include/my_net.h:
  Added INADDR_NONE define
sql-common/client.c:
  removed INADDR_NONE define as it is moved to my_net.h
sql/mysqld.cc:
  add my_net.h define and remove INADDR_NONE

rem0rec.ic:
  Replace (int16_t) with (signed short).


innobase/include/rem0rec.ic:
  Replace (int16_t) with (signed short).

into hundin.mysql.fi:/home/heikki/mysql-5.0

include/mysql.h:
  Adding an option for data truncations feature.
libmysql/libmysql.c:
  No 'smart' behaviour now for data truncations: they are always
  reported, unless switched off with 
  mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1));
sql-common/client.c:
  Add support for report-data-truncation variable in my.cnf
tests/client_test.c:
  A test for MYSQL_REPORT_DATA_TRUNCATION option.

  Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz


innobase/include/page0page.ic:
  Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz

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

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

(Bug#7381)


libmysql/libmysql.c:
  Fixing compile-time failures in recently pushed code (aCC)
tests/client_test.c:
  Fix a couple of -pedantic warnings.

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

sql/share/Makefile.am:
  - make sure to include errmsg.txt into the source distribution

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new

into polly.local:/home/kaa/src/mysql-5.0


configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new


sql/field.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .


mysql-test/include/ps_conv.inc:
  updated comment
mysql-test/include/ps_create.inc:
  replaced the data type bit with tinyint
mysql-test/r/ps_1general.result:
  updated results
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
mysql-test/r/ps_7ndb.result:
  updated results
mysql-test/t/ps_4heap.test:
  replaced the data type bit with tinyint
mysql-test/t/ps_5merge.test:
  replaced the data type bit with tinyint

  distribution when running "make dist"


innobase/include/Makefile.am:
  - added file trx0xa.h which was missing from the source distribution when
    running "make dist"

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

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

storage engine.


mysql-test/mysql-test-run.sh:
  We should skip starting of slave server only if test is BOTH 
  not replication related and not federated storage engine related.
mysql-test/r/ps_1general.result:
  Fixed test result after federated storage engine was added.

server-tools/instance-manager/mysql_connection.cc:
  move constructor to .cc file
server-tools/instance-manager/mysql_connection.h:
  move constructor to .cc file

mysql-test/r/federated.result:
  new test results
mysql-test/t/federated.test:
  added order by, group by
sql/ha_federated.cc:
  - added 'scheme' to URL
  - added proper escaping
  - made sure &my_charset_bin is being used throughout handler
  - made sure create_table catches improper URL in comment upon table creation
sql/ha_federated.h:
  added scheme to share

into patrick-galbraiths-computer.local:/Users/patg/5.0-federated


sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

sql/examples/ha_archive.cc:
  Fixed from code review. Cleaned up comment and fixed issue with mean length of row.

into arthur.local:/my/mysql-5.0-clean

sql/share/errmsg.txt:
  Removed incorrect error messages; Fixed serbian messages.

mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().