← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2011-02-04 22:30:00 UTC
  • mto: (2147.1.1 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2148.
  • Revision ID: brian@tangent.org-20110204223000-iarxulhsorv5s4z1
Merge in cleanup of dead class to drizzle structures (its C++ we don't need
to be doing this any longer).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
114
114
#include "ha_prototypes.h"
115
115
#include "ut0mem.h"
116
116
#include "ibuf0ibuf.h"
117
 
#include "mysql_addons.h"
118
117
 
119
118
#include "ha_innodb.h"
120
119
#include "data_dictionary.h"
1263
1262
  my_casedn_str(system_charset_info, a);
1264
1263
}
1265
1264
 
1266
 
/**********************************************************************//**
1267
 
Determines the connection character set.
1268
 
@return connection character set */
1269
 
UNIV_INTERN
1270
 
const void*
1271
 
innobase_get_charset(
1272
 
/*=================*/
1273
 
  drizzled::Session *mysql_session)  /*!< in: MySQL thread handle */
1274
 
{
1275
 
  return mysql_session->charset();
1276
 
}
1277
 
 
1278
1265
UNIV_INTERN
1279
1266
bool
1280
1267
innobase_isspace(
1284
1271
  return my_isspace(static_cast<const CHARSET_INFO *>(cs), char_to_test);
1285
1272
}
1286
1273
 
1287
 
UNIV_INTERN
1288
 
int
1289
 
innobase_fast_mutex_init(
1290
 
        os_fast_mutex_t*        fast_mutex)
1291
 
{
1292
 
  return pthread_mutex_init(fast_mutex, MY_MUTEX_INIT_FAST);
1293
 
}
1294
 
 
1295
 
/**********************************************************************//**
1296
 
Determines the current SQL statement.
1297
 
@return        SQL statement string */
1298
 
UNIV_INTERN
1299
 
const char*
1300
 
innobase_get_stmt(
1301
 
/*==============*/
1302
 
       drizzled::Session *session,        /*!< in: MySQL thread handle */
1303
 
       size_t* length)         /*!< out: length of the SQL statement */
1304
 
{
1305
 
  return session->getQueryStringCopy(*length);
1306
 
}
1307
 
 
1308
1274
#if defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN)
1309
1275
/*******************************************************************//**
1310
1276
Map an OS error to an errno value. The OS error number is stored in
6246
6212
    }
6247
6213
  }
6248
6214
 
6249
 
  stmt = innobase_get_stmt(&session, &stmt_len);
 
6215
  stmt= session.getQueryStringCopy(stmt_len);
6250
6216
 
6251
6217
  if (stmt) {
6252
6218
    string generated_create_table;