bk commit into 5.1 tree (ramil:1.2582)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-02 17:14:48+05:00, ramil@stripped +1 -0
  After-merge fix: result adjusted.

  mysql-test/r/show_check.result@stripped, 2007-08-02 17:14:38+05:00, ramil@stripped +3 -0
    After-merge fix: result adjusted.

diff -Nrup a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
--- a/mysql-test/r/show_check.result	2007-08-02 16:55:26 +05:00
+++ b/mysql-test/r/show_check.result	2007-08-02 17:14:38 +05:00
@@ -1250,6 +1250,9 @@ select 1 from information_schema.tables 
 show status like 'slow_queries';
 Variable_name	Value
 Slow_queries	2
+show variables like 'myisam_recover_options';
+Variable_name	Value
+myisam_recover_options	OFF
 End of 5.0 tests
 SHOW AUTHORS;
 create database mysqltest;