← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/ha_pbxt.cc

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_pbxt.cc
4665
4665
                                                 * when a record is deleted we add an xlog record which we cannot "rollback" later
4666
4666
                                                 * when we find that an FK-constraint has failed. 
4667
4667
                                                 */
4668
 
                                                thd->getLex()->ignore = false;
 
4668
                                                thd->lex->ignore = false;
4669
4669
                                        case SQLCOM_UPDATE:
4670
4670
#ifndef DRIZZLED
4671
4671
                                        case SQLCOM_UPDATE_MULTI:
5723
5723
        return xt_ha_pbxt_thread_error_for_mysql(thd, xt_ha_thd_to_self(thd), false);
5724
5724
}
5725
5725
 
5726
 
int PBXTStorageEngine::doCommit(drizzled::Session* thd, bool real_commit)
 
5726
int PBXTStorageEngine::doCommit(drizzled::Session* thd, bool)
5727
5727
{
5728
5728
        int err = 0;
5729
5729
        XTThreadPtr self = (XTThreadPtr) *thd->getEngineData(pbxt_hton);
5730
5730
 
 
5731
        bool real_commit = !session_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
 
5732
        
5731
5733
        XT_PRINT1(self, "PBXTStorageEngine::doCommit(real_commit = %s)\n", real_commit ? "true" : "false");
5732
5734
 
5733
5735
        if (real_commit && self) {
5738
5740
        return err;
5739
5741
}
5740
5742
 
5741
 
int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool real_commit)
 
5743
int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool)
5742
5744
{
5743
5745
        int err = 0;
5744
5746
        XTThreadPtr self = (XTThreadPtr) *thd->getEngineData(pbxt_hton);
5745
5747
 
 
5748
        bool real_commit = !session_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
 
5749
 
5746
5750
        XT_PRINT1(self, "PBXTStorageEngine::doRollback(real_commit = %s)\n", real_commit ? "true" : "false");
5747
5751
 
5748
5752
        if (real_commit && self) {
6213
6217
        "High performance, multi-versioning transactional engine",
6214
6218
        PLUGIN_LICENSE_GPL,
6215
6219
        pbxt_init, /* Plugin Init */
6216
 
        NULL,          /* depends */
 
6220
        NULL,          /* system variables                */
6217
6221
        NULL                                            /* config options                  */
6218
6222
}
6219
6223
DRIZZLE_DECLARE_PLUGIN_END;
6231
6235
        0x0001 /* 0.1 */,
6232
6236
        NULL,                       /* status variables                */
6233
6237
#if MYSQL_VERSION_ID >= 50118
6234
 
        pbxt_system_variables,          /* depends */
 
6238
        pbxt_system_variables,          /* system variables                */
6235
6239
#else
6236
6240
        NULL,
6237
6241
#endif
6247
6251
        pbxt_exit_statistics,                                           /* plugin deinit */
6248
6252
        0x0005,
6249
6253
        NULL,                                                                           /* status variables */
6250
 
        NULL,                                                                           /* depends */
 
6254
        NULL,                                                                           /* system variables */
6251
6255
        NULL                                                                            /* config options */
6252
6256
}
6253
6257
mysql_declare_plugin_end;