← 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: 2011-02-18 16:15:33 UTC
  • mfrom: (2179.2.1 list-clear)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: brian@tangent.org-20110218161533-mkgbhtbpfj8mb12x
Merge in clear() by Olaf

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
845
845
                      &default_key_create_info,
846
846
                      0, lex->col_list);
847
847
    statement->alter_info.key_list.push_back(key);
848
 
    lex->col_list.empty();
 
848
    lex->col_list.clear();
849
849
  }
850
850
  if (type_modifier & (UNIQUE_FLAG | UNIQUE_KEY_FLAG))
851
851
  {
855
855
                 &default_key_create_info, 0,
856
856
                 lex->col_list);
857
857
    statement->alter_info.key_list.push_back(key);
858
 
    lex->col_list.empty();
 
858
    lex->col_list.clear();
859
859
  }
860
860
 
861
861
  if (default_value)
1086
1086
  ptr->alias= (char*) "(nested_join)";
1087
1087
  embedding= ptr;
1088
1088
  join_list= &nested_join->join_list;
1089
 
  join_list->empty();
 
1089
  join_list->clear();
1090
1090
  return false;
1091
1091
}
1092
1092
 
1161
1161
  ptr->setJoinList(join_list);
1162
1162
  ptr->alias= (char*) "(nest_last_join)";
1163
1163
  embedded_list= &nested_join->join_list;
1164
 
  embedded_list->empty();
 
1164
  embedded_list->clear();
1165
1165
 
1166
1166
  for (uint32_t i=0; i < 2; i++)
1167
1167
  {