Commit 0369cf93 authored by Yasufumi Kinoshita's avatar Yasufumi Kinoshita

Merge mysql-5.1 to mysql-5.5.

parents e7bbd218 1fbe6c50
...@@ -7782,6 +7782,10 @@ ha_innobase::records_in_range( ...@@ -7782,6 +7782,10 @@ ha_innobase::records_in_range(
/* There exists possibility of not being able to find requested /* There exists possibility of not being able to find requested
index due to inconsistency between MySQL and InoDB dictionary info. index due to inconsistency between MySQL and InoDB dictionary info.
Necessary message should have been printed in innobase_get_index() */ Necessary message should have been printed in innobase_get_index() */
if (prebuilt->table->ibd_file_missing) {
n_rows = HA_POS_ERROR;
goto func_exit;
}
if (UNIV_UNLIKELY(!index)) { if (UNIV_UNLIKELY(!index)) {
n_rows = HA_POS_ERROR; n_rows = HA_POS_ERROR;
goto func_exit; goto func_exit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment