← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Stewart Smith
  • Date: 2010-08-09 20:08:37 UTC
  • mfrom: (1638.9.14)
  • mto: (1720.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1721.
  • Revision ID: stewart@flamingspork.com-20100809200837-veaxdmduf2ph2vd2
Merged store-foreign-key-in-table-proto into show-create-table-using-table-message.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
50
50
using namespace std;
51
51
using namespace drizzled;
52
52
 
53
 
extern pthread_mutex_t LOCK_global_system_variables;
54
53
static const string engine_name("MyISAM");
55
54
 
56
55
pthread_mutex_t THR_LOCK_myisam= PTHREAD_MUTEX_INITIALIZER;
1223
1222
    share->db_options_in_use= misam_info.options;
1224
1223
    stats.block_size= myisam_key_cache_block_size;        /* record block size */
1225
1224
 
1226
 
    /* Update share */
1227
 
    if (share->getType() == message::Table::STANDARD)
1228
 
      pthread_mutex_lock(&share->mutex);
1229
1225
    set_prefix(share->keys_in_use, share->sizeKeys());
1230
1226
    /*
1231
1227
     * Due to bug 394932 (32-bit solaris build failure), we need
1278
1274
      memcpy(table->key_info[0].rec_per_key,
1279
1275
             misam_info.rec_per_key,
1280
1276
             sizeof(table->key_info[0].rec_per_key)*share->key_parts);
1281
 
    if (share->getType() == message::Table::STANDARD)
1282
 
      pthread_mutex_unlock(&share->mutex);
 
1277
    assert(share->getType() != message::Table::STANDARD);
1283
1278
 
1284
1279
   /*
1285
1280
     Set data_file_name and index_file_name to point at the symlink value