into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1

into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1


sql/opt_sum.cc:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

            functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.


mysql-test/r/myisam.result:
  Test case for BUG#20357.
mysql-test/t/myisam.test:
  Test case for BUG#20357.
sql/opt_sum.cc:
  Skip disabled/ignored indexes for min/max optimization.

into  mysql.com:/data0/knielsen/mysql-5.0

Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order


mysql-test/valgrind.supp:
  Add suppression for Valgrind warning.

into  mysql.com:/home/marty/MySQL/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  mysql.com:/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint


client/mysqldump.c:
  Auto merged
BitKeeper/etc/ignore:
  Added BitKeeper/etc/RESYNC_TREE to the ignore list
mysql-test/r/mysqldump.result:
  Manual merge.
mysql-test/t/mysqldump.test:
  Manual merge.

  Additional fix for #16377 for bigendian platforms
sql_select.cc, select.result, select.test:
  After merge fix


mysql-test/t/select.test:
  After merge fix
mysql-test/r/select.result:
  After merge fix
sql/sql_select.cc:
  After merge fix
sql/field.h:
  Additional fix for #16377 for bigendian platforms
sql/field.cc:
  Additional fix for #16377 for bigendian platforms

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.


support-files/mysql.server.sh:
  Support getting additional arguments, which need to be passed on to the server.
  This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
  So if the IM would be used, additional arguments cause the start to fail (voluntarily).
  
  This feature is needed so that tools like RPM can start the server in an "isolated" way,
  see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
support-files/mysql.spec.sh:
  Call "mysql_upgrade" during an RPM upgrade.
  
  "mysql_upgrade" needs a server to run, as it issues SQL commands.
  (This had been neglected previously.)
  It also needs to connect as "root", but in an RPM upgrade the password is unknown.
  To allow this, the server is started "--skip-grant-tables".
  Normally, this would open big security holes, so it is also started "--skip-networking",
  and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.

into moonbone.local:/work/tmp_merge-4.1-opt-mysql

mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

  Added test case for bug#18759 Incorrect string to numeric conversion.  
select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal


sql/item_cmpfunc.cc:
  Cleanup after fix for bug#18360 removal
mysql-test/t/select.test:
  Added test case for bug#18759 Incorrect string to numeric conversion.
mysql-test/r/select.result:
  Added test case for bug#18759 Incorrect string to numeric conversion.

mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged

into  mysql.com:/home/emurphy/mysql-5.0-heikki

Fixes bug#17264, for alter table on win32 for successfull operation completion
it is used TL_WRITE(=10) lock instead of TL_WRITE_ALLOW_READ(=6), however here
in innodb handler TL_WRTIE is lifted to TL_WRITE_ALLOW_WRITE, which causes
race condition when several clients do alter table simultaneously.


mysql-test/r/lock_multi.result:
  Test case for bug#17264.
mysql-test/t/lock_multi.test:
  Test case for bug#17264

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/ndbapi/ndberror.c:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged

into  mysql.com:/mnt/storeage/mysql-5.0

into sunlight.local:/home/evgen/tmp_merge-5.0-opt-mysql

  After merge fix


sql/item_cmpfunc.cc:
  After merge fix

  After merge fix


mysql-test/r/func_time.result:
  After merge fix

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

ndb/src/mgmsrv/MgmtSrvr.cpp:
  user correct pointer

into  mysql.com:/usr/home/ram/work/mysql-4.1


mysql-test/r/func_str.result:
  merge (ul)
mysql-test/t/func_str.test:
  merge (ul)
sql/item_strfunc.cc:
  merge (ul)
sql/item_strfunc.h:
  merge (ul)

into  mysql.com:/usr/home/ram/work/mysql-4.1

regex/regexec.c:
  The Win64 pre-processor evaluates state1 at the end of the chain at replace-time not at definition-time.  This causes states1 to be defined as char *.

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


sql/ha_ndbcluster.cc:
  Auto merged