← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_class.cc

  • Committer: Brian Aker
  • Date: 2008-07-26 18:39:33 UTC
  • mfrom: (212.1.3 codestyle)
  • Revision ID: brian@tangent.org-20080726183933-hueup0fcy2zs1hug
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_class.cc
239
239
 
240
240
extern "C"
241
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__)))
 
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
247
  thd->proc_info= info;
432
432
*/
433
433
 
434
434
void
435
 
Diagnostics_area::set_error_status(THD *thd __attribute__((__unused__)),
 
435
Diagnostics_area::set_error_status(THD *thd __attribute__((unused)),
436
436
                                   uint sql_errno_arg,
437
437
                                   const char *message_arg)
438
438
{
1250
1250
  Item **place;
1251
1251
  Item *old_value;
1252
1252
  /* Placement new was hidden by `new' in ilink (TODO: check): */
1253
 
  static void *operator new(size_t size __attribute__((__unused__)),
 
1253
  static void *operator new(size_t size __attribute__((unused)),
1254
1254
                            void *mem)
1255
1255
    { return mem; }
1256
 
  static void operator delete(void *ptr __attribute__((__unused__)),
1257
 
                              size_t size __attribute__((__unused__)))
 
1256
  static void operator delete(void *ptr __attribute__((unused)),
 
1257
                              size_t size __attribute__((unused)))
1258
1258
    {}
1259
 
  static void operator delete(void *ptr __attribute__((__unused__)),
1260
 
                              void *mem __attribute__((__unused__)))
 
1259
  static void operator delete(void *ptr __attribute__((unused)),
 
1260
                              void *mem __attribute__((unused)))
1261
1261
    { /* never called */ }
1262
1262
};
1263
1263
 
2044
2044
     sortcmp(val1, val2, cache->collation.collation) < 0);
2045
2045
}
2046
2046
 
2047
 
bool select_exists_subselect::send_data(List<Item> &items __attribute__((__unused__)))
 
2047
bool select_exists_subselect::send_data(List<Item> &items __attribute__((unused)))
2048
2048
{
2049
2049
  Item_exists_subselect *it= (Item_exists_subselect *)item;
2050
2050
  if (unit->offset_limit_cnt)