← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/xtradb/handler/ha_innodb.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2015-06-13 21:09:48 UTC
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: package-import@ubuntu.com-20150613210948-0un6au1f6ujj37lv
Tags: upstream-5.5.44
Import upstream version 5.5.44

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/xtradb/handler/ha_innodb.cc
102
102
#include "ibuf0ibuf.h"
103
103
 
104
104
enum_tx_isolation thd_get_trx_isolation(const THD* thd);
105
 
 
106
105
}
107
106
 
108
107
#include "ha_innodb.h"
7327
7326
 
7328
7327
        DBUG_ENTER("general_fetch");
7329
7328
 
 
7329
        /* If transaction is not startted do not continue, instead return a error code. */
 
7330
        if(!(prebuilt->sql_stat_start || (prebuilt->trx && prebuilt->trx->state == 1))) {
 
7331
                DBUG_RETURN(HA_ERR_END_OF_FILE);
 
7332
        }
 
7333
 
7330
7334
        if (UNIV_UNLIKELY(share->ib_table->is_corrupt &&
7331
7335
                          srv_pass_corrupt_table <= 1)) {
7332
7336
                DBUG_RETURN(HA_ERR_CRASHED);