← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
216
216
       mysql_handle_derived(thd->lex, &mysql_derived_filling)))
217
217
    return(1);
218
218
 
219
 
  MYSQL_UPDATE_START();
 
219
  DRIZZLE_UPDATE_START();
220
220
  thd_proc_info(thd, "init");
221
221
  table= table_list->table;
222
222
 
255
255
  if (select_lex->inner_refs_list.elements &&
256
256
    fix_inner_refs(thd, all_fields, select_lex, select_lex->ref_pointer_array))
257
257
  {
258
 
    MYSQL_UPDATE_END();
 
258
    DRIZZLE_UPDATE_END();
259
259
    return(-1);
260
260
  }
261
261
 
291
291
    free_underlaid_joins(thd, select_lex);
292
292
    if (error)
293
293
      goto abort;                               // Error in where
294
 
    MYSQL_UPDATE_END();
 
294
    DRIZZLE_UPDATE_END();
295
295
    my_ok(thd);                         // No matching records
296
296
    return(0);
297
297
  }
711
711
  id= thd->arg_of_last_insert_id_function ?
712
712
    thd->first_successful_insert_id_in_prev_stmt : 0;
713
713
 
714
 
  MYSQL_UPDATE_END();
 
714
  DRIZZLE_UPDATE_END();
715
715
  if (error < 0)
716
716
  {
717
717
    char buff[STRING_BUFFER_USUAL_SIZE];
736
736
  thd->abort_on_warning= 0;
737
737
 
738
738
abort:
739
 
  MYSQL_UPDATE_END();
 
739
  DRIZZLE_UPDATE_END();
740
740
  return(1);
741
741
}
742
742