into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.1-engines


sql/table.cc:
  Manual merge.

into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-5.0-engines


sql/table.cc:
  Manual merge.

into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines


BitKeeper/deleted/.del-index_merge.result:
  Auto merged
BitKeeper/deleted/.del-index_merge_ror.result:
  Auto merged
mysql-test/include/index_merge_ror.inc:
  Auto merged
sql/opt_range.cc:
  Use local

            repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.


mysql-test/r/index_merge.result:
  Fixed a test case according to fix for bug#25048.
mysql-test/r/index_merge_ror.result:
  A test case for bug#25048.
mysql-test/t/index_merge_ror.test:
  A test case for bug#25048.
sql/opt_range.cc:
  Do not use key read when head->no_keyread is set.

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Manual merge from 5.0.

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged

configure.in:
  Fix an omission: Version number for NDB is still kept separate (up to 5.0)
  and must be changed in sync with the general version number in AM_INIT_AUTOMAKE.

into  trift2.:/MySQL/M51/tmp-5.1


client/mysql_upgrade.c:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Null merge: Socket name change of 5.0 does not apply here.
mysql-test/t/rpl_000015.test:
  SCCS merged

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Null-merge: The new 5.0 version does not affect 5.1 at all

sql/mysqld.cc:
  Post-merge fix
sql/set_var.cc:
  Post-merge fix

into  siva.hindu.god:/usr/home/tim/m/bk/51-build


cmd-line-utils/readline/histfile.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
mysql-test/t/func_str.test:
  Manual merge
sql/mysqld.cc:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge
storage/innobase/handler/ha_innodb.h:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge

into  siva.hindu.god:/usr/home/tim/m/bk/51-build


storage/innobase/dict/dict0dict.c:
  Null merge
storage/innobase/handler/ha_innodb.cc:
  Null merge
storage/innobase/include/sync0rw.h:
  Null merge
storage/innobase/include/sync0sync.h:
  Null merge
storage/innobase/include/sync0sync.ic:
  Null merge
storage/innobase/log/log0recv.c:
  Null merge
storage/innobase/srv/srv0start.c:
  Null merge
storage/innobase/sync/sync0rw.c:
  Null merge
storage/innobase/sync/sync0sync.c:
  Null merge
storage/innobase/trx/trx0roll.c:
  Null merge
storage/innobase/trx/trx0trx.c:
  Null merge

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build

into  chilla.local:/home/mydev/mysql-5.1-axmrg


storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


myisam/mi_packrec.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/rt_split.c:
  Auto merged
myisam/mi_write.c:
  Manual merge from 4.1.

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.


myisam/mi_range.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
myisam/mi_test1.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Declared an parameter unused to get rid of warnings.
myisam/mi_write.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized a variable to get rid of a compiler warning.
  Casted arguments to DBUG_PRINT to match them with their
  format string conversion specification.
myisam/rt_split.c:
  Bug#25213 - Compiler warnings in MyISAM code
  Initialized variables to get rid of compiler warnings.

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.


myisam/mi_packrec.c:
  Bug#25208 - Warnings in mi_packrec.c
  Fixed DBUG_PRINT format specifiactions.

into  trift2.:/MySQL/M50/clone-5.0

into  trift2.:/MySQL/M50/clone-5.0

into  trift2.:/MySQL/M50/push-5.0

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release


client/mysql_upgrade.c:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release

into  siva.hindu.god:/usr/home/tim/m/bk/50-build

cmd-line-utils/readline/histfile.c:
  Remove warning (compare signed & unsigned)
sql/udf_example.c:
  Remove warning (cast integer to pointer of different size)
strings/decimal.c:
  Remove warning (%lx format, double arg)

into  siva.hindu.god:/usr/home/tim/m/bk/50-build


sql/ha_innodb.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/50-release

more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).

This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.

InnoDB timeout behavior (Bug #24200)


mysql-test/t/innodb_mysql-master.opt:
  Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out.
  
  This *could* cause random test failures if some long-running transaction concurrency is being tested.  However, such a test really should go in innodb-big or some other test file.

Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.


mysql-test/r/func_str.result:
  Update test results for bug #24947
mysql-test/t/func_str.test:
  Add test case for bug #24947
sql/item_strfunc.cc:
  Adjust some string function Items' val_str() methods to handle large signed/unsigned arguments properly

into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_class.h:
  Auto merged
configure.in:
  Manual merge from 5.0.

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_class.h:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG23255/mysql-5.1-engines

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000015.test:
  SCCS merged
mysql-test/t/rpl000017.test:
  SCCS merged