← Back to branch summary

~ubuntu-branches/ubuntu/raring/drizzle/raring

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2011-03-15 10:41:18 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110315104118-eaf0hvlytjdl4zrf
Tags: 2011.03.13-0ubuntu1
* New upstream release.
* Added slave plugin.
* Removed archive, blackhole and blitzdb plugins.
* Moved location of libdrizzle headers.
* Removed drizzleadmin manpage patch.
* Add drizzle_safe_write_string to symbols.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
48
48
#include <drizzled/charset_info.h>
49
49
#include <drizzled/internal/m_string.h>
50
50
#include <drizzled/internal/my_sys.h>
51
 
#include <drizzled/my_hash.h>
52
51
#include <drizzled/plugin.h>
53
52
#include <drizzled/show.h>
54
53
#include <drizzled/data_home.h>
462
461
  UNIV_INTERN int doCreateTable(Session &session,
463
462
                                Table &form,
464
463
                                const identifier::Table &identifier,
465
 
                                message::Table&);
 
464
                                const message::Table&);
466
465
  UNIV_INTERN int doRenameTable(Session&, const identifier::Table &from, const identifier::Table &to);
467
466
  UNIV_INTERN int doDropTable(Session &session, const identifier::Table &identifier);
468
467
 
6020
6019
UNIV_INTERN
6021
6020
int
6022
6021
InnobaseEngine::doCreateTable(
6023
 
/*================*/
6024
 
  Session         &session, /*!< in: Session */
6025
 
  Table&    form,   /*!< in: information on table columns and indexes */
6026
 
        const identifier::Table &identifier,
6027
 
        message::Table& create_proto)
 
6022
                              /*================*/
 
6023
                              Session         &session, /*!< in: Session */
 
6024
                              Table&    form,   /*!< in: information on table columns and indexes */
 
6025
                              const identifier::Table &identifier,
 
6026
                              const message::Table& create_proto)
6028
6027
{
6029
6028
  int   error;
6030
6029
  dict_table_t* innobase_table;
9257
9256
          po::value<bool>(&strict_mode)->default_value(false)->zero_tokens(),
9258
9257
          "Use strict mode when evaluating create options.");
9259
9258
  context("replication-log",
9260
 
          po::value<bool>(&innobase_use_replication_log)->default_value(false),
 
9259
          po::value<bool>(&innobase_use_replication_log)->default_value(false)->zero_tokens(),
9261
9260
          _("Enable internal replication log."));
9262
9261
  context("lock-wait-timeout",
9263
9262
          po::value<lock_wait_constraint>(&lock_wait_timeout)->default_value(50),