← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2010-07-30 02:42:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1679.
  • Revision ID: brian@gaz-20100730024229-3vnq0wmp3ep6hxf5
This replaces the allocation we do for insert/update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
930
930
  }
931
931
  if (!(ptr = (TableList *) session->calloc(sizeof(TableList))))
932
932
    return NULL;
 
933
 
933
934
  if (table->db.str)
934
935
  {
935
936
    ptr->setIsFqtn(true);
1107
1108
  List<TableList> *embedded_list;
1108
1109
 
1109
1110
  if (!(ptr= (TableList*) session->calloc(ALIGN_SIZE(sizeof(TableList))+
1110
 
                                       sizeof(nested_join_st))))
 
1111
                                          sizeof(nested_join_st))))
1111
1112
    return NULL;
1112
1113
  ptr->setNestedJoin(((nested_join_st*) ((unsigned char*) ptr + ALIGN_SIZE(sizeof(TableList)))));
1113
1114
  nested_join= ptr->getNestedJoin();