← Back to branch summary

~vkolesnikov/pbxt/pbxt-pb_mysql_thd-fix

« back to all changes in this revision

Viewing changes to src/ha_pbxt.cc

  • Committer: Paul McCullagh
  • Date: 2010-09-10 14:46:31 UTC
  • Revision ID: paul.mccullagh@primebase.org-20100910144631-cmctxqghnpz4iyqh
Changes from merge with MariaDB

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ha_pbxt.cc
80
80
#include "systab_xt.h"
81
81
#include "xaction_xt.h"
82
82
#include "backup_xt.h"
 
83
#include "heap_xt.h"
83
84
 
84
85
#ifdef DEBUG
85
86
//#define XT_USE_SYS_PAR_DEBUG_SIZES
1231
1232
                                THD *thd = NULL;
1232
1233
 
1233
1234
#ifndef DRIZZLED
 
1235
#if MYSQL_VERSION_ID < 50147
 
1236
                                /* A hack which is no longer required after 5.1.46 */
1234
1237
                                extern myxt_mutex_t LOCK_plugin;
 
1238
#endif
1235
1239
 
1236
1240
                                /* {MYSQL QUIRK}
1237
1241
                                 * I have to release this lock for PBXT recovery to
2013
2017
                        xt_ha_open_database_of_table(self, (XTPathStrPtr) NULL);
2014
2018
                }
2015
2019
 
2016
 
                err = myxt_statistics_fill_table(self, thd, tables, cond, system_charset_info);
 
2020
                err = myxt_statistics_fill_table(self, thd, tables, cond, (void*) system_charset_info);
2017
2021
        }
2018
2022
        catch_(a) {
2019
2023
                err = xt_ha_pbxt_thread_error_for_mysql(thd, self, FALSE);
6158
6162
drizzle_declare_plugin_end;
6159
6163
#else
6160
6164
mysql_declare_plugin_end;
 
6165
#ifdef MARIADB_BASE_VERSION
 
6166
maria_declare_plugin(pbxt)
 
6167
{ /* PBXT */
 
6168
  MYSQL_STORAGE_ENGINE_PLUGIN,
 
6169
  &pbxt_storage_engine,
 
6170
  "PBXT",
 
6171
  "Paul McCullagh, PrimeBase Technologies GmbH",
 
6172
  "High performance, multi-versioning transactional engine",
 
6173
  PLUGIN_LICENSE_GPL,
 
6174
  pbxt_init, /* Plugin Init */
 
6175
  pbxt_end, /* Plugin Deinit */
 
6176
  0x0001 /* 0.1 */,
 
6177
  NULL,                       /* status variables */
 
6178
  pbxt_system_variables,      /* system variables */
 
6179
  "1.0.09g RC3",              /* string version */
 
6180
  MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
 
6181
},
 
6182
{ /* PBXT_STATISTICS */
 
6183
  MYSQL_INFORMATION_SCHEMA_PLUGIN,
 
6184
  &pbxt_statitics,
 
6185
  "PBXT_STATISTICS",
 
6186
  "Paul McCullagh, PrimeBase Technologies GmbH",
 
6187
  "PBXT internal system statitics",
 
6188
  PLUGIN_LICENSE_GPL,
 
6189
  pbxt_init_statistics,       /* plugin init */
 
6190
  pbxt_exit_statistics,       /* plugin deinit */
 
6191
  0x0005,
 
6192
  NULL,                       /* status variables */
 
6193
  NULL,                       /* system variables */
 
6194
  "1.0.09g RC3",              /* string version */
 
6195
  MariaDB_PLUGIN_MATURITY_GAMMA /* maturity */
 
6196
}
 
6197
maria_declare_plugin_end;
 
6198
#endif
6161
6199
#endif
6162
6200
 
6163
6201
#if defined(XT_WIN) && defined(XT_COREDUMP)