← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_lex.h

Merged changes from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_lex.h
36
36
#ifdef MYSQL_YACC
37
37
#define LEX_YYSTYPE void *
38
38
#else
39
 
#if MYSQL_LEX
 
39
#if defined(MYSQL_LEX)
40
40
#include "lex_symbol.h"
41
41
#include "sql_yacc.h"
42
42
#define LEX_YYSTYPE YYSTYPE *
70
70
  SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB,
71
71
  SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT,
72
72
  SQLCOM_OPTIMIZE, SQLCOM_CHECK,
73
 
  SQLCOM_ASSIGN_TO_KEYCACHE, SQLCOM_PRELOAD_KEYS,
 
73
  SQLCOM_ASSIGN_TO_KEYCACHE,
74
74
  SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_ANALYZE,
75
75
  SQLCOM_ROLLBACK, SQLCOM_ROLLBACK_TO_SAVEPOINT,
76
76
  SQLCOM_COMMIT, SQLCOM_SAVEPOINT, SQLCOM_RELEASE_SAVEPOINT,
366
366
  }
367
367
  static void *operator new(size_t size, MEM_ROOT *mem_root)
368
368
  { return (void*) alloc_root(mem_root, (uint) size); }
369
 
  static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); }
370
 
  static void operator delete(void *ptr, MEM_ROOT *mem_root) {}
 
369
  static void operator delete(void *ptr __attribute__((__unused__)),
 
370
                              size_t size __attribute__((__unused__)))
 
371
  { TRASH(ptr, size); }
 
372
  static void operator delete(void *ptr __attribute__((__unused__)),
 
373
                              MEM_ROOT *mem_root __attribute__((__unused__)))
 
374
  {}
371
375
  st_select_lex_node(): linkage(UNSPECIFIED_TYPE) {}
372
376
  virtual ~st_select_lex_node() {}
373
377
  inline st_select_lex_node* get_master() { return master; }
390
394
  virtual List<Item>* get_item_list();
391
395
  virtual ulong get_table_join_options();
392
396
  virtual TABLE_LIST *add_table_to_list(THD *thd, Table_ident *table,
393
 
                                        LEX_STRING *alias,
394
 
                                        ulong table_options,
395
 
                                        thr_lock_type flags= TL_UNLOCK,
396
 
                                        List<Index_hint> *hints= 0,
 
397
                                        LEX_STRING *alias,
 
398
                                        ulong table_options,
 
399
                                        thr_lock_type flags= TL_UNLOCK,
 
400
                                        List<Index_hint> *hints= 0,
397
401
                                        LEX_STRING *option= 0);
398
 
  virtual void set_lock_for_tables(thr_lock_type lock_type) {}
 
402
  virtual void set_lock_for_tables(thr_lock_type lock_type __attribute__((__unused__)))
 
403
  {}
399
404
 
400
405
  friend class st_select_lex_unit;
401
406
  friend bool mysql_new_select(struct st_lex *lex, bool move_down);
1677
1682
  {
1678
1683
    return (void*) alloc_root(mem_root, (uint) size);
1679
1684
  }
1680
 
  static void operator delete(void *ptr,size_t size)
 
1685
  static void operator delete(void *ptr __attribute__((__unused__)),
 
1686
                              size_t size __attribute__((__unused__)))
1681
1687
  { TRASH(ptr, size); }
1682
 
  static void operator delete(void *ptr, MEM_ROOT *mem_root)
 
1688
  static void operator delete(void *ptr __attribute__((__unused__)),
 
1689
                              MEM_ROOT *mem_root __attribute__((__unused__)))
1683
1690
  { /* Never called */ }
1684
1691
};
1685
1692