← 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: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
324
324
 
325
325
  virtual ~InnobaseEngine()
326
326
  {
327
 
    int err= 0;
328
327
    if (innodb_inited) {
329
328
      srv_fast_shutdown = (ulint) innobase_fast_shutdown;
330
329
      innodb_inited = 0;
331
330
      hash_table_free(innobase_open_tables);
332
331
      innobase_open_tables = NULL;
333
332
      if (innobase_shutdown_for_mysql() != DB_SUCCESS) {
334
 
        err = 1;
 
333
        // Throw here?
335
334
      }
336
335
      srv_free_paths_and_sizes();
337
336
      if (internal_innobase_data_file_path)
493
492
 
494
493
  void doGetTableIdentifiers(drizzled::CachedDirectory &directory,
495
494
                             const drizzled::identifier::Schema &schema_identifier,
496
 
                             drizzled::identifier::Table::vector &set_of_identifiers);
 
495
                             drizzled::identifier::table::vector &set_of_identifiers);
497
496
  bool validateCreateTableOption(const std::string &key, const std::string &state);
498
497
  void dropTemporarySchema();
499
498
 
522
521
 
523
522
void InnobaseEngine::doGetTableIdentifiers(drizzled::CachedDirectory &directory,
524
523
                                           const drizzled::identifier::Schema &schema_identifier,
525
 
                                           drizzled::identifier::Table::vector &set_of_identifiers)
 
524
                                           drizzled::identifier::table::vector &set_of_identifiers)
526
525
{
527
526
  CachedDirectory::Entries entries= directory.getEntries();
528
527
 
1178
1177
  uint  )   /*!< in: max query length to print, or 0 to
1179
1178
           use the default max length */
1180
1179
{
1181
 
  drizzled::identifier::User::const_shared_ptr user_identifier(in_session->user());
 
1180
  drizzled::identifier::user::ptr user_identifier(in_session->user());
1182
1181
 
1183
1182
  fprintf(f,
1184
1183
          "Drizzle thread %"PRIu64", query id %"PRIu64", %s, %s, %s ",
3990
3989
      ulint     true_len;
3991
3990
      ulint     key_len;
3992
3991
      const unsigned char*    src_start;
3993
 
      enum_field_types  real_type;
3994
3992
      const charset_info_st* cs= field->charset();
3995
3993
 
3996
3994
      key_len = key_part->length;
4002
4000
      }
4003
4001
 
4004
4002
      src_start = record + key_part->offset;
4005
 
      real_type = field->real_type();
4006
4003
      true_len = key_len;
4007
4004
 
4008
4005
      /* Character set for the field is defined only
6553
6550
  innobase_commit_low(trx);
6554
6551
  trx_free_for_mysql(trx);
6555
6552
 
 
6553
  if (error) {
 
6554
    // What do we do here?
 
6555
  }
 
6556
 
6556
6557
  return false; // We are just a listener since we lack control over DDL, so we give no positive acknowledgement. 
6557
6558
}
6558
6559