← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_update.cc

  • Committer: Monty Taylor
  • Date: 2008-07-09 15:52:52 UTC
  • mto: (77.6.1 glibclient-merge)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: monty@inaugust.com-20080709155252-lnzmxxje1g40z3a7
Warning fixes. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_update.cc
173
173
int mysql_update(THD *thd,
174
174
                 TABLE_LIST *table_list,
175
175
                 List<Item> &fields,
176
 
                 List<Item> &values,
 
176
                 List<Item> &values,
177
177
                 COND *conds,
178
178
                 uint order_num, ORDER *order,
179
 
                 ha_rows limit,
180
 
                 enum enum_duplicates handle_duplicates, bool ignore)
 
179
                 ha_rows limit,
 
180
                 enum enum_duplicates handle_duplicates __attribute__((__unused__)),
 
181
                 bool ignore)
181
182
{
182
183
  bool          using_limit= limit != HA_POS_ERROR;
183
184
  bool          safe_update= test(thd->options & OPTION_SAFE_UPDATES);
1046
1047
  Connect fields with tables and create list of tables that are updated
1047
1048
*/
1048
1049
 
1049
 
int multi_update::prepare(List<Item> &not_used_values,
1050
 
                          SELECT_LEX_UNIT *lex_unit)
 
1050
int multi_update::prepare(List<Item> &not_used_values __attribute__((__unused__)),
 
1051
                          SELECT_LEX_UNIT *lex_unit __attribute__((__unused__)))
1051
1052
{
1052
1053
  TABLE_LIST *table_ref;
1053
1054
  SQL_LIST update;
1335
1336
  if (copy_field)
1336
1337
    delete [] copy_field;
1337
1338
  thd->count_cuted_fields= CHECK_FIELD_IGNORE;          // Restore this setting
1338
 
  assert(trans_safe || !updated || 
 
1339
  assert(trans_safe || !updated ||
1339
1340
              thd->transaction.all.modified_non_trans_table);
1340
1341
}
1341
1342
 
1342
1343
 
1343
 
bool multi_update::send_data(List<Item> &not_used_values)
 
1344
bool multi_update::send_data(List<Item> &not_used_values __attribute__((__unused__)))
1344
1345
{
1345
1346
  TABLE_LIST *cur_table;
1346
1347