1. 20 Sep, 2007 1 commit
    • unknown's avatar
      Bug#19828: Case sensitivity in hostname leads to inconsistent behavior · eeeeec8e
      unknown authored
      clean up SHOW GRANTS so it will show host-names with case as entered.
      make REVOKE and friends case-sensitive to make things more intuitive.
      Patch by Martin Friebe.
      
      
      mysql-test/r/grant.result:
        Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
        
        clean up after test so random order of tests is possible
      mysql-test/r/grant3.result:
        Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
        
        Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.
      mysql-test/t/grant.test:
        Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
        
        clean up after test so random order of tests is possible
      mysql-test/t/grant3.test:
        Bug#19828: Case sensitivity in hostname leads to inconsistent behavior
        
        Show that REVOKE, SHOW GRANTS etc. are now consistently case-sensitive.
      eeeeec8e
  2. 20 Jul, 2007 1 commit
  3. 19 Jul, 2007 3 commits
  4. 18 Jul, 2007 1 commit
    • unknown's avatar
      Bug#26909: Specified key was too long; max key length is 255 bytes \ · 8b8b430b
      unknown authored
      	when creating table
      
      Federated tables had an artificially low maximum of key length, 
      because the handler failed to implement a method to return it and 
      the default value is taked from the prototype handler.
      
      Now, implement that method and return the maximum possible key
      length, which is that of InnoDB.
      
      
      mysql-test/r/federated.result:
        Verify that unique keys may be longer than 255 characters.
      mysql-test/t/federated.test:
        Verify that unique keys may be longer than 255 characters.
      sql/ha_federated.h:
        Implement the virtual method that tells the max size of parts to 
        make a key.
        
        Backport the length defined in 5.1.
      8b8b430b
  5. 17 Jul, 2007 5 commits
  6. 16 Jul, 2007 5 commits
  7. 15 Jul, 2007 1 commit
    • unknown's avatar
      Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in · 8023d919
      unknown authored
      Linux Debug build (possible deadlock)"
      
      The bug is not repeatable any more.
      
      
      mysql-test/r/innodb_mysql.result:
        Update test results (Bug#27296)
      mysql-test/t/innodb_mysql.test:
        Add a teste case for Bug#27296 "Assertion in ALTER TABLE SET DEFAULT in 
        Linux Debug build (possible deadlock)"
      8023d919
  8. 14 Jul, 2007 4 commits
  9. 13 Jul, 2007 7 commits
    • unknown's avatar
      Bug#27198: Error returns from time() are ignored · a7e5f73a
      unknown authored
      gettimeofday() can fail and presumably, so can time().
      Keep an eye on it.
      
      Since we have no data on this at all so far, we just
      retry on failure (and log the event), assuming that
      this is just an intermittant failure. This might of
      course hang the threat until we succeed. Once we know
      more about these failures, an appropriate more clever
      scheme may be picked (only try so many times per thread,
      etc., if that fails, return last "good" time() we got or
      some such).  Using sql_print_information() to log as this
      probably only occurs in high load scenarios where the debug-
      trace likely is disabled (or might interfere with testing
      the effect).  No test-case as this is a non-deterministic
      issue.
      
      
      sql/mysql_priv.h:
        Bug#27198: Error returns from time() are ignored
        
        move declarations for log.cc to before inclusion of
        sql_class.h as we now use sql_print_information() in
        there.
      sql/sql_class.h:
        Bug#27198: Error returns from time() are ignored
        
        gettimeofday() can fail and presumably, so can time().
        Keep an eye on it.
      a7e5f73a
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · b5761c5c
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
      
      
      sql/set_var.cc:
        Auto merged
      b5761c5c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj · 55245408
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      55245408
    • unknown's avatar
      When opening a new connecgtion, changed mysqltest to prefer a brand new... · d3d38d0b
      unknown authored
      When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail. bug#29579
      
      
      client/mysqltest.c:
        When opening a new connecgtion, changed mysqltest to prefer a brand new connection slot over an existing, closed slot. Fixes a problem with reused slots that can cause tests to fail.
      d3d38d0b
    • unknown's avatar
      Minor fixes for test failures and compiler warnings for Bug #29579. · 4bbeef1c
      unknown authored
      
      BitKeeper/deleted/.del-ssl_big.test:
        Delete: mysql-test/t/ssl_big.test
      extra/yassl/include/yassl_int.hpp:
        added comment
      extra/yassl/src/yassl_int.cpp:
        Changed init order to fix a compiler warning.
      mysql-test/r/mysqltest.result:
        There is no limit to connections anymore.
      mysql-test/t/mysqltest.test:
        There is no limit to connections anymore.
      4bbeef1c
    • unknown's avatar
      Merge damien-katzs-computer.local:/Users/dkatz/mysql50 · 91112d12
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/50
      
      
      91112d12
    • unknown's avatar
      Bug #29579 Clients using SSL can hang the server · b7527f6b
      unknown authored
      Added an option to yassl to allow "quiet shutdown" like openssl does. This option causes the SSL libs to NOT perform the close_notify handshake during shutdown. This fixes a hang we experience because we hold a lock during socket shutdown.
      
      
      mysql-test/t/ssl_big.test:
        BitKeeper file /Users/dkatz/50/mysql-test/t/ssl_big.test
      mysql-test/r/ssl-big.result:
        BitKeeper file /Users/dkatz/50/mysql-test/r/ssl-big.result
      client/mysqltest.c:
        Added new command to mysqltest to send a quit command to the server, but to not close the actual socket on our end.
        
        Also changed code to reuse connection slots, so that the tests can open and close sockets in a loop.
      extra/yassl/include/openssl/ssl.h:
        Added C accessors to the quietShutdown option.
      extra/yassl/include/yassl_int.hpp:
        Added quietShutdown_ member and accessor methods to the SSL class.
      extra/yassl/src/ssl.cpp:
        Added accessors to get/set the quietShutdown option and to not perform the shutdown handshake if quietShutdown is set.
      extra/yassl/src/yassl_int.cpp:
        Added quietShutdown_ member and accessor methods to the SSL class.
      vio/viossl.c:
        Added line to set the quiet_shutdown option before shutting down the socket.
      mysql-test/t/ssl-big.test:
        Added a test that causes an unpatched server to hang during SSL socket shutdown.
      b7527f6b
  10. 12 Jul, 2007 7 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 42a41896
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_prepare.cc:
        Auto merged
      42a41896
    • unknown's avatar
      Apply community contributed fix for Bug#13326 SQLPS statement logging is · 0e2bb8dd
      unknown authored
      incomplete in 5.0 (and review fixes).
      
      When in 5.0.13 I introduced class Prepared_statement and methods
      ::prepare and ::execute, general logging was left out of this class.
      This was good for stored procedures, since in stored procedures
      we do not log sub-statements, but introduced a regression in case of SQL
      syntax for prepared statements, as previously we would log the actual
      statements to the log, and after the change we would log only
      COM_QUERY text.
      
      Restore the old behavior, but still suppress logging if inside a stored 
      procedure.
      
      Based on a community contributed patch from Vladimir Shebordaev.
      
      No test case since we do not have a mechanism to test output
      of the general log.
      
      
      sql/sql_prepare.cc:
        Apply community contributed fix for Bug#13326 SQLPS statement logging is 
        incomplete in 5.0 (and review fixes).
      0e2bb8dd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1d40659c
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.0-26141-final
      
      
      sql/sql_yacc.yy:
        Auto merged
      1d40659c
    • unknown's avatar
      A fix and a test case for Bug#26141 mixing table types in trigger · 9dc3088f
      unknown authored
      causes full table lock on innodb table.
      Also fixes Bug#28502 Triggers that update another innodb table 
      will block on X lock unnecessarily (duplciate).
      Code review fixes.
      
      Both bugs' synopses are misleading: InnoDB table is
      not X locked. The statements, however, cannot proceed concurrently, 
      but this happens due to lock conflicts for tables used in triggers,
      not for the InnoDB table. 
      
      If a user had an InnoDB table, and two triggers, AFTER UPDATE and 
      AFTER INSERT, competing for different resources (e.g. two distinct
      MyISAM tables), then these two triggers would not be able to execute
      concurrently. Moreover, INSERTS/UPDATES of the InnoDB table would
      not be able to run concurrently. 
      The problem had other side-effects (see respective bug reports).
      
      This behavior was a consequence of a shortcoming of the pre-locking
      algorithm, which would not distinguish between different DML operations
      (e.g. INSERT and DELETE) and pre-lock all the tables
      that are used by any trigger defined on the subject table.
      
      The idea of the fix is to extend the pre-locking algorithm to keep track,
      for each table, what DML operation it is used for and not
      load triggers that are known to never be fired.
      
      
      mysql-test/r/trigger-trans.result:
        Update results (Bug#26141)
      mysql-test/r/trigger.result:
        Update results (Bug#28502)
      mysql-test/t/trigger-trans.test:
        Add a test case for Bug#26141 mixing table types in trigger causes 
        full table lock on innodb table.
      mysql-test/t/trigger.test:
        Add a test case for Bug#28502 Triggers that update another innodb 
        table will block echo on X lock unnecessarily. Add more test 
        coverage for triggers.
      sql/item.h:
        enum trg_event_type is needed in table.h
      sql/sp.cc:
        Take into account table_list->trg_event_map when determining
        what tables to pre-lock. 
        
        After this change, if we attempt to fire a 
        trigger for which we had not pre-locked any tables, error
        'Table was not locked with LOCK TABLES' will be printed.
        This, however, should never happen, provided the pre-locking
        algorithm has no programming bugs.
        
        Previously a trigger key in the sroutines hash was based on the name 
        of the table the trigger belongs to. This was possible because we would
        always add to the pre-locking list all the triggers defined for a table when
        handling this table.
        Now the key is based on the name of the trigger, owing
        to the fact that a trigger name must be unique in the database it
        belongs to.
      sql/sp_head.cc:
        Generate sroutines hash key in init_spname(). This is a convenient
        place since there we have all the necessary information and can
        avoid an extra alloc.
        
        Maintain and merge trg_event_map when adding and merging elements
        of the pre-locking list.
      sql/sp_head.h:
        Add ,m_sroutines_key member, used when inserting the sphead for a
        trigger into the cache of routines used by a statement.
        Previously the key was based on the table name the trigger belonged
        to, since for a given table we would add to the sroutines list
        all the triggers defined on it.
      sql/sql_lex.cc:
        Introduce a new lex step: set_trg_event_type_for_tables().
        It is called when we have finished parsing but before opening
        and locking tables. Now this step is used to evaluate for each
        TABLE_LIST instance which INSERT/UPDATE/DELETE operation, if any,
        it is used in.
        In future this method could be extended to aggregate other information
        that is hard to aggregate during parsing.
      sql/sql_lex.h:
        Add declaration for set_trg_event_type_for_tables().
      sql/sql_parse.cc:
        Call set_trg_event_type_for_tables() after MYSQLparse(). Remove tabs.
      sql/sql_prepare.cc:
        Call set_trg_event_type_for_tables() after  MYSQLparse().
      sql/sql_trigger.cc:
        Call set_trg_event_type_for_tables() after MYSQLparse().
      sql/sql_trigger.h:
        Remove an obsolete member.
      sql/sql_view.cc:
        Call set_trg_event_type_for_tables() after MYSQLparse().
      sql/sql_yacc.yy:
        Move assignment of sp_head::m_type before calling sp_head::init_spname(), 
        one is now used inside another.
      sql/table.cc:
        Implement TABLE_LIST::set_trg_event_map() - a method that calculates
        wh triggers may be fired on this table when executing a statement.
      sql/table.h:
        Add missing declarations.
        Move declaration of trg_event_type from item.h (it will be needed for 
        trg_event_map bitmap when we start using Bitmap template instead
        of uint8).
      9dc3088f
    • unknown's avatar
      Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 5529b14f
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      5529b14f
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug28249/my50-bug28249 · 5ee37c14
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      mysql-test/t/query_cache.test:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      mysql-test/r/query_cache.result:
        SCCS merged
      5ee37c14
    • unknown's avatar
      Bug#28249 Query Cache returns wrong result with concurrent insert / certain lock · 30810f80
      unknown authored
      A race condition in the integration between MyISAM and the query cache code 
      caused the query cache to fail to invalidate itself on concurrently inserted
      data.
      
      This patch fix this problem by using the existing handler interface which, upon
      each statement cache attempt, compare the size of the table as viewed from the 
      cache writing thread and with any snap shot of the global table state. If the
      two sizes are different the global table size is unknown and the current
      statement can't be cached.
      
      
      mysql-test/r/query_cache.result:
        Added test case
      mysql-test/t/query_cache.test:
        Added test case
      sql/ha_myisam.cc:
        - Implemented handler interface for ha_myisam class to dermine if the table
         belonging to the currently processed statement can be cached or not.
      sql/ha_myisam.h:
        - Implemented handler interface for ha_myisam class to dermine if the table
         belonging to the currently processed statement can be cached or not.
      sql/handler.h:
        - Documented register_query_cache_table method in the handler interface.
      30810f80
  11. 11 Jul, 2007 3 commits
  12. 10 Jul, 2007 2 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 3d984162
      unknown authored
      into  mysql.com:/home/tnurnberg/22540/50-22540
      
      
      sql/log.cc:
        Auto merged
      3d984162
    • unknown's avatar
      NULL MERGE UP to 5.1. · 9016198a
      unknown authored
      Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
      
      Fixes:
      Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
      Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
      Bug#25645: Assertion failure in file srv0srv.c
      Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
      Bug#28138: indexing column prefixes produces corruption in InnoDB
      
      
      innobase/btr/btr0btr.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1547:
        branches/5.0: Merge r1546 from trunk:
        
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug #28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      innobase/buf/buf0buf.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1502:
        branches/5.0: Add debug code for Bug 26081. This change has some debug
        assertions that have been promoted to normal assertions. These will need
        to be undone once we've nailed this bug.
      innobase/buf/buf0lru.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1502:
        branches/5.0: Add debug code for Bug 26081. This change has some debug
        assertions that have been promoted to normal assertions. These will need
        to be undone once we've nailed this bug.
      innobase/ibuf/ibuf0ibuf.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1547:
        branches/5.0: Merge r1546 from trunk:
        
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug #28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      innobase/include/buf0buf.ic:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1502:
        branches/5.0: Add debug code for Bug 26081. This change has some debug
        assertions that have been promoted to normal assertions. These will need
        to be undone once we've nailed this bug.
      innobase/include/buf0lru.h:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1502:
        branches/5.0: Add debug code for Bug 26081. This change has some debug
        assertions that have been promoted to normal assertions. These will need
        to be undone once we've nailed this bug.
      innobase/include/dict0dict.h:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1547:
        branches/5.0: Merge r1546 from trunk:
        
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug #28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      innobase/include/dict0dict.ic:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1547:
        branches/5.0: Merge r1546 from trunk:
        
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug #28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      innobase/include/dict0mem.h:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1537:
        branches/5.0: merge r1536 and partially r1535
        
        Change the comment to a more appropriate one. Discussed with Heikki on IM.
        
        Document that DICT_MAX_INDEX_COL_LEN should not be changed.
      innobase/include/os0file.h:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1417:
        branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      innobase/include/trx0trx.h:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1463:
        branches/5.0: merge r1462 from trunk:
        
        Fix typo in comment.
      innobase/lock/lock0lock.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1458:
        branches/5.0: Fix Bug#22819, remove assertion.  (http://bugs.mysql.com/bug.php?id=22819)
      innobase/log/log0log.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1520:
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
        
        
        Revision r1525:
        backport of r1524
        
        Log:
        Undo bad space formatting introduced in earlier commit r1521
        
        spotted by: Marko
      innobase/mtr/mtr0mtr.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1502:
        branches/5.0: Add debug code for Bug 26081. This change has some debug
        assertions that have been promoted to normal assertions. These will need
        to be undone once we've nailed this bug.
      innobase/os/os0file.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1417:
        branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
        ERROR_LOCK_VIOLATION is encountered during file operation.
        This is caused by backup software, so InnoDB should retry while the backup
        software is done with the file.
        
        Approved by:	Heikki
      innobase/rem/rem0rec.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1547:
        branches/5.0: Merge r1546 from trunk:
        
        When buffering an insert to a prefix index of a variable-length column,
        do not incorrectly mark the column as fixed-length.  (Bug #28138)
        
        ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
        dtype_new_store_for_order_and_null_size().  Add debug assertions.
        
        btr_index_rec_validate(): Correct a comment about prefix indexes.
        
        rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
        debug assertions and comments.
        
        dict_col_type_assert_equal(): New debug function.
      innobase/row/row0sel.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1456:
        branches/5.0: merge r1452 from trunk:
        
        Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
        patch in the bug followup.
      innobase/srv/srv0srv.c:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1460:
        branches/5.0: Merge r1459 from trunk:
        
        Fix typo in the comment.
        
        
        Revision r1520:
        Patch to allow monitor threads to stop before proceeding with normal shutdown. 
        Also have a separate time counter for tablespace monitor.
        
        reviewed by: Heikki
      sql/ha_innodb.cc:
        Apply innodb-5.0-* snapshots:  ss1489 and ss1547.
        
        Revision r1436:
        branches/5.0: Fix Bug#27294 by using trx returned by check_trx_exists()
        instead of prebuilt->trx. This has been fixed in 5.1 in r782.
        
        Approved by:	Heikki
        
        
        Revision r1443:
        branches/5.0: merge r1442 from trunk:
        
        Potential fix for Bug#25645:
        
        "Move innobase_release_stat_resources(trx) outside the 'if' in
        ha_innobase::external_lock(). That would add more safety that whatever
        MySQL does at a query end, there would be no risk of a hang on the btr
        search latch."
        
        Also call innobase_release_temporary_latches() in the beginning of
        ha_innobase::close().
        
        Approved by:	Heikki
        
        
        Revision r1454:
        branches/5.0: merge r1453 from trunk:
        
        Bugfix: only call innobase_release_temporary_latches() in case of current_thd
        is not NULL, otherwise we get NULL pointer dereferencing.
        
        
        
        Revision r1504:
        branches/5.0: Apply patch for Bug 27650 from MySQL.
        
        
        Revision r1539:
        Backport of r1538 from 5.1
        Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for
        normal processing of the query by MySQL instead of generating an error.
        
        Reviewed by: Heikki
      9016198a