This finishes bug#18516, as far as "generic RPMs" are concerned.

manual merge from 4.0.

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

  An UNIQUE KEY consisting of NOT NULL columns
  was displayed as PRIMARY KEY in "DESC t1".
  According to the code, that was intentional
  behaviour for some reasons unknown to me.
  This code was written before bitkeeper time,
  so I cannot check who and why made this.
  After discussing on dev-public, a decision
  was made to remove this code

  Disable the simplistic auto dependency scan for test/bench (bug#20078)

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

1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

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

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

This bug in Field_string::cmp resulted in a wrong comparison 
with keys in partial indexes over multi-byte character fields.
Given field a is declared as a varchar(16) collate utf8_unicode_ci
INDEX(a(4)) gives us an example of such an index.
  
Wrong key comparisons could lead to wrong result sets if 
the selected query execution plan used a range scan by 
a partial index over a utf8 character field.
This also caused wrong results in many other cases.

into  mysql.com:/home/bk/fix-mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

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

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

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

            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.

into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0

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

into  mysql.com:/home/kgeorge/mysql/5.0/B18080

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

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

into  mysql.com:/home/kgeorge/mysql/5.0/B20482

            schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.

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