← 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: 2010-09-19 22:22:14 UTC
  • mfrom: (1775.4.4 trunk)
  • Revision ID: brian@tangent.org-20100919222214-sme2je0fxo3gdtkh
Rollup of a outstanding merge requests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
7520
7520
        !strcmp(share->table_name, table_name));
7521
7521
 
7522
7522
  if (!share) {
7523
 
 
7524
 
    uint length = (uint) strlen(table_name);
7525
 
 
7526
7523
    /* TODO: invoke HASH_MIGRATE if innobase_open_tables
7527
7524
    grows too big */
7528
7525
 
7529
 
    share = (INNOBASE_SHARE *) malloc(sizeof(*share)+length+1);
7530
 
                memset(share, 0, sizeof(*share)+length+1);
7531
 
 
7532
 
    share->table_name = (char*) memcpy(share + 1,
7533
 
               table_name, length + 1);
 
7526
    share= new INNOBASE_SHARE(table_name);
7534
7527
 
7535
7528
    HASH_INSERT(INNOBASE_SHARE, table_name_hash,
7536
7529
          innobase_open_tables, fold, share);
7566
7559
    HASH_DELETE(INNOBASE_SHARE, table_name_hash,
7567
7560
          innobase_open_tables, fold, share);
7568
7561
    share->lock.deinit();
7569
 
    free(share);
 
7562
    delete share;
7570
7563
 
7571
7564
    /* TODO: invoke HASH_MIGRATE if innobase_open_tables
7572
7565
    shrinks too much */