Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com

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

current SP tables locking make impossible view security" with main tree.

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2

impossible view security".

We should not expose names of tables which are explicitly or implicitly (via
routine or trigger) used by view even if we find that they are missing.
So during building of list of prelocked tables for statement we track which
routines (and therefore tables for these routines) are used from views. We
mark elements of LEX::routines set which correspond to routines used in views
by setting Sroutine_hash_entry::belong_to_view member to point to TABLE_LIST
object for topmost view which uses routine. We propagate this mark to all
routines which are used by this routine and which we add to this set. We also
mark tables used by such routine which we add to the list of tables for
prelocking as belonging to this view.

into  mysql.com:/home/timka/mysql/src/5.0-2486

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

statement that generated a warning. (Bug #15510)

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

 prepared statement execute

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

into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52

 to crash".
 Changes from snapshot innodb-5.0-ss52.
 Note that buf_block_t::index should be protected by btr_search_latch
 or an s-latch or x-latch on the index page.
 btr_search_drop_page_hash_index(): Read block->index while holding
 btr_search_latch and use the cached value in the loop. Remove some
 redundant assertions.
 Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also added test cases to 9802.

into  mysql.com:/home/timka/mysql/src/5.0-2486

Changed variable type and added comment in sp.c.

into  mysql.com:/usr/home/pem/bug14233/mysql-5.0

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

into mysql.com:/M50/mysql-5.0

into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-Z

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

Solution according to the comments made by Guilhem
- rpl_relayrotate  Remove the SHOW SLAVE STATUS  It is not needed.
- rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value

(Backport of an identical change from 5.0)

into mysql.com:/M50/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

  is not defined.

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1