← 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-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
4658
4658
{
4659
4659
  ST_SCHEMA_TABLE *schema_table;
4660
4660
 
4661
 
  if (!(schema_table= (ST_SCHEMA_TABLE *)my_malloc(sizeof(ST_SCHEMA_TABLE),
4662
 
                                MYF(MY_WME | MY_ZEROFILL))))
 
4661
  if (!(schema_table= (ST_SCHEMA_TABLE *)malloc(sizeof(ST_SCHEMA_TABLE))))
4663
4662
      return(1);
 
4663
  memset(schema_table, 0, sizeof(ST_SCHEMA_TABLE));
 
4664
 
4664
4665
  /* Historical Requirement */
4665
4666
  plugin->data= schema_table; // shortcut for the future
4666
4667
  if (plugin->plugin->init)