← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_class.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_class.cc
238
238
 
239
239
 
240
240
extern "C"
241
 
const char *set_thd_proc_info(THD *thd, const char *info, 
242
 
                              const char *calling_function, 
243
 
                              const char *calling_file, 
244
 
                              const unsigned int calling_line)
 
241
const char *set_thd_proc_info(THD *thd, const char *info,
 
242
                              const char *calling_function __attribute__((__unused__)),
 
243
                              const char *calling_file __attribute__((__unused__)),
 
244
                              const unsigned int calling_line __attribute__((__unused__)))
245
245
{
246
246
  const char *old_info= thd->proc_info;
247
 
  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line, 
 
247
  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line,
248
248
                           (info != NULL) ? info : "(null)"));
249
249
  thd->proc_info= info;
250
250
  return old_info;
440
440
*/
441
441
 
442
442
void
443
 
Diagnostics_area::set_error_status(THD *thd, uint sql_errno_arg,
 
443
Diagnostics_area::set_error_status(THD *thd __attribute__((__unused__)),
 
444
                                   uint sql_errno_arg,
444
445
                                   const char *message_arg)
445
446
{
446
447
  /*
1312
1313
  Item **place;
1313
1314
  Item *old_value;
1314
1315
  /* Placement new was hidden by `new' in ilink (TODO: check): */
1315
 
  static void *operator new(size_t size, void *mem) { return mem; }
1316
 
  static void operator delete(void *ptr, size_t size) {}
1317
 
  static void operator delete(void *ptr, void *mem) { /* never called */ }
 
1316
  static void *operator new(size_t size __attribute__((__unused__)),
 
1317
                            void *mem)
 
1318
    { return mem; }
 
1319
  static void operator delete(void *ptr __attribute__((__unused__)),
 
1320
                              size_t size __attribute__((__unused__)))
 
1321
    {}
 
1322
  static void operator delete(void *ptr __attribute__((__unused__)),
 
1323
                              void *mem __attribute__((__unused__)))
 
1324
    { /* never called */ }
1318
1325
};
1319
1326
 
1320
1327
 
2109
2116
     sortcmp(val1, val2, cache->collation.collation) < 0);
2110
2117
}
2111
2118
 
2112
 
bool select_exists_subselect::send_data(List<Item> &items)
 
2119
bool select_exists_subselect::send_data(List<Item> &items __attribute__((__unused__)))
2113
2120
{
2114
2121
  DBUG_ENTER("select_exists_subselect::send_data");
2115
2122
  Item_exists_subselect *it= (Item_exists_subselect *)item;
2116
2123
  if (unit->offset_limit_cnt)
2117
 
  {                                       // Using limit offset,count
 
2124
  { // Using limit offset,count
2118
2125
    unit->offset_limit_cnt--;
2119
2126
    DBUG_RETURN(0);
2120
2127
  }