← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2008-12-15 21:57:36 UTC
  • Revision ID: brian@tangent.org-20081215215736-hlzp4imvnuwu4mtn
Removed casting from a few operations (passing this so Mark can fix the
rest).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
4660
4660
{
4661
4661
  ST_SCHEMA_TABLE *schema_table;
4662
4662
 
4663
 
  if (!(schema_table= (ST_SCHEMA_TABLE *)malloc(sizeof(ST_SCHEMA_TABLE))))
4664
 
      return(1);
 
4663
  if ((schema_table= new ST_SCHEMA_TABLE) == NULL)
 
4664
    return(1);
4665
4665
  memset(schema_table, 0, sizeof(ST_SCHEMA_TABLE));
4666
4666
 
4667
4667
  /* Historical Requirement */
4687
4687
    schema_table->table_name= plugin->name.str;
4688
4688
  }
4689
4689
 
4690
 
  return(0);
 
4690
  return 0;
4691
4691
err:
4692
 
  free(schema_table);
4693
 
  return(1);
 
4692
  delete schema_table;
 
4693
 
 
4694
  return 1;
4694
4695
}
4695
4696
 
4696
4697
int finalize_schema_table(st_plugin_int *plugin)
4698
4699
  ST_SCHEMA_TABLE *schema_table= (ST_SCHEMA_TABLE *)plugin->data;
4699
4700
 
4700
4701
  if (schema_table && plugin->plugin->deinit)
4701
 
    free(schema_table);
 
4702
    delete schema_table;
4702
4703
 
4703
4704
  return(0);
4704
4705
}