← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2010-11-03 16:49:41 UTC
  • mfrom: (1900 merge)
  • mto: This revision was merged to the branch mainline in revision 1902.
  • Revision ID: brian@tangent.org-20101103164941-bil4aktjwrm3jo8a
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
128
128
 
129
129
int mysql_update(Session *session, TableList *table_list,
130
130
                 List<Item> &fields, List<Item> &values, COND *conds,
131
 
                 uint32_t order_num, order_st *order,
 
131
                 uint32_t order_num, Order *order,
132
132
                 ha_rows limit, enum enum_duplicates,
133
133
                 bool ignore)
134
134
{
629
629
    true  error
630
630
*/
631
631
bool mysql_prepare_update(Session *session, TableList *table_list,
632
 
                         Item **conds, uint32_t order_num, order_st *order)
 
632
                         Item **conds, uint32_t order_num, Order *order)
633
633
{
634
634
  List<Item> all_fields;
635
635
  Select_Lex *select_lex= &session->lex->select_lex;