← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_lex.h

  • 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_lex.h
339
339
  }
340
340
  static void *operator new(size_t size, MEM_ROOT *mem_root)
341
341
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
342
 
  static void operator delete(void *ptr __attribute__((__unused__)),
343
 
                              size_t size __attribute__((__unused__)))
 
342
  static void operator delete(void *ptr __attribute__((unused)),
 
343
                              size_t size __attribute__((unused)))
344
344
  { TRASH(ptr, size); }
345
 
  static void operator delete(void *ptr __attribute__((__unused__)),
346
 
                              MEM_ROOT *mem_root __attribute__((__unused__)))
 
345
  static void operator delete(void *ptr __attribute__((unused)),
 
346
                              MEM_ROOT *mem_root __attribute__((unused)))
347
347
  {}
348
348
  st_select_lex_node(): linkage(UNSPECIFIED_TYPE) {}
349
349
  virtual ~st_select_lex_node() {}
372
372
                                        thr_lock_type flags= TL_UNLOCK,
373
373
                                        List<Index_hint> *hints= 0,
374
374
                                        LEX_STRING *option= 0);
375
 
  virtual void set_lock_for_tables(thr_lock_type lock_type __attribute__((__unused__)))
 
375
  virtual void set_lock_for_tables(thr_lock_type lock_type __attribute__((unused)))
376
376
  {}
377
377
 
378
378
  friend class st_select_lex_unit;
1601
1601
  {
1602
1602
    return (void*) alloc_root(mem_root, (uint32_t) size);
1603
1603
  }
1604
 
  static void operator delete(void *ptr __attribute__((__unused__)),
1605
 
                              size_t size __attribute__((__unused__)))
 
1604
  static void operator delete(void *ptr __attribute__((unused)),
 
1605
                              size_t size __attribute__((unused)))
1606
1606
  { TRASH(ptr, size); }
1607
 
  static void operator delete(void *ptr __attribute__((__unused__)),
1608
 
                              MEM_ROOT *mem_root __attribute__((__unused__)))
 
1607
  static void operator delete(void *ptr __attribute__((unused)),
 
1608
                              MEM_ROOT *mem_root __attribute__((unused)))
1609
1609
  { /* Never called */ }
1610
1610
};
1611
1611