← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: brian
  • Date: 2008-07-30 14:39:38 UTC
  • mfrom: (257.1.1 drizzle)
  • Revision ID: brian@localhost.localdomain-20080730143938-arq3f70gw8b8565u
Merge from Brian (aka me)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
413
413
%token  BINARY                        /* SQL-2003-R */
414
414
%token  BINLOG_SYM
415
415
%token  BIN_NUM
416
 
%token  BIT_AND                       /* MYSQL-FUNC */
417
 
%token  BIT_OR                        /* MYSQL-FUNC */
418
416
%token  BIT_SYM                       /* MYSQL-FUNC */
419
 
%token  BIT_XOR                       /* MYSQL-FUNC */
420
417
%token  BLOB_SYM                      /* SQL-2003-R */
421
418
%token  BLOCK_SYM
422
419
%token  BOOLEAN_SYM                   /* SQL-2003-R */
438
435
%token  CHAR_SYM                      /* SQL-2003-R */
439
436
%token  CHECKSUM_SYM
440
437
%token  CHECK_SYM                     /* SQL-2003-R */
441
 
%token  CIPHER_SYM
442
 
%token  CLIENT_SYM
443
438
%token  CLOSE_SYM                     /* SQL-2003-R */
444
439
%token  COALESCE                      /* SQL-2003-N */
445
 
%token  CODE_SYM
446
440
%token  COLLATE_SYM                   /* SQL-2003-R */
447
441
%token  COLLATION_SYM                 /* SQL-2003-N */
448
442
%token  COLUMNS
461
455
%token  CONTAINS_SYM                  /* SQL-2003-N */
462
456
%token  CONTEXT_SYM
463
457
%token  CONTINUE_SYM                  /* SQL-2003-R */
464
 
%token  CONTRIBUTORS_SYM
465
458
%token  CONVERT_SYM                   /* SQL-2003-N */
466
459
%token  COUNT_SYM                     /* SQL-2003-N */
467
 
%token  CPU_SYM
468
460
%token  CREATE                        /* SQL-2003-R */
469
461
%token  CROSS                         /* SQL-2003-R */
470
462
%token  CUBE_SYM                      /* SQL-2003-R */
490
482
%token  DECIMAL_SYM                   /* SQL-2003-R */
491
483
%token  DECLARE_SYM                   /* SQL-2003-R */
492
484
%token  DEFAULT                       /* SQL-2003-R */
493
 
%token  DEFINER_SYM
494
485
%token  DELAYED_SYM
495
486
%token  DELAY_KEY_WRITE_SYM
496
487
%token  DELETE_SYM                    /* SQL-2003-R */
497
488
%token  DESC                          /* SQL-2003-N */
498
489
%token  DESCRIBE                      /* SQL-2003-R */
499
 
%token  DES_KEY_FILE
500
490
%token  DETERMINISTIC_SYM             /* SQL-2003-R */
501
491
%token  DIRECTORY_SYM
502
492
%token  DISABLE_SYM
516
506
%token  END                           /* SQL-2003-R */
517
507
%token  ENDS_SYM
518
508
%token  END_OF_INPUT                  /* INTERNAL */
519
 
%token  ENGINES_SYM
520
509
%token  ENGINE_SYM
521
510
%token  ENUM
522
511
%token  EQ                            /* OPERATOR */
525
514
%token  ESCAPED
526
515
%token  ESCAPE_SYM                    /* SQL-2003-R */
527
516
%token  EVENTS_SYM
528
 
%token  EVERY_SYM                     /* SQL-2003-N */
529
517
%token  EXCLUSIVE_SYM
530
518
%token  EXISTS                        /* SQL-2003-R */
531
519
%token  EXIT_SYM
586
574
%token  INTO                          /* SQL-2003-R */
587
575
%token  INT_SYM                       /* SQL-2003-R */
588
576
%token  IN_SYM                        /* SQL-2003-R */
589
 
%token  IO_SYM
590
 
%token  IPC_SYM
591
577
%token  IS                            /* SQL-2003-R */
592
578
%token  ISOLATION                     /* SQL-2003-R */
593
 
%token  ISSUER_SYM
594
579
%token  ITERATE_SYM
595
580
%token  JOIN_SYM                      /* SQL-2003-R */
596
581
%token  KEYS
706
691
%token  PRIMARY_SYM                   /* SQL-2003-R */
707
692
%token  PROCESS
708
693
%token  PROCESSLIST_SYM
709
 
%token  PROFILES_SYM
710
694
%token  PURGE
711
695
%token  QUARTER_SYM
712
696
%token  QUERY_SYM
3399
3383
        | '+' simple_expr %prec NEG { $$= $2; }
3400
3384
        | '-' simple_expr %prec NEG
3401
3385
          { $$= new (YYTHD->mem_root) Item_func_neg($2); }
3402
 
        | '~' simple_expr %prec NEG
3403
 
          { $$= new (YYTHD->mem_root) Item_func_bit_neg($2); }
3404
3386
        | '(' subselect ')'
3405
3387
          { 
3406
3388
            $$= new (YYTHD->mem_root) Item_singlerow_subselect($2);
3811
3793
          { $$=new Item_sum_avg($3); }
3812
3794
        | AVG_SYM '(' DISTINCT in_sum_expr ')'
3813
3795
          { $$=new Item_sum_avg_distinct($4); }
3814
 
        | BIT_AND  '(' in_sum_expr ')'
3815
 
          { $$=new Item_sum_and($3); }
3816
 
        | BIT_OR  '(' in_sum_expr ')'
3817
 
          { $$=new Item_sum_or($3); }
3818
 
        | BIT_XOR  '(' in_sum_expr ')'
3819
 
          { $$=new Item_sum_xor($3); }
3820
3796
        | COUNT_SYM '(' opt_all '*' ')'
3821
3797
          { $$=new Item_sum_count(new Item_int((int32_t) 0L,1)); }
3822
3798
        | COUNT_SYM '(' in_sum_expr ')'
5616
5592
          { Lex->type|= REFRESH_SLAVE; }
5617
5593
        | MASTER_SYM
5618
5594
          { Lex->type|= REFRESH_MASTER; }
5619
 
        | DES_KEY_FILE
5620
 
          { Lex->type|= REFRESH_DES_KEY_FILE; }
5621
5595
        | RESOURCES
5622
5596
          { Lex->type|= REFRESH_USER_RESOURCES; }
5623
5597
        ;
6370
6344
        | CASCADED                 {}
6371
6345
        | CHAIN_SYM                {}
6372
6346
        | CHANGED                  {}
6373
 
        | CIPHER_SYM               {}
6374
 
        | CLIENT_SYM               {}
6375
6347
        | COALESCE                 {}
6376
 
        | CODE_SYM                 {}
6377
6348
        | COLLATION_SYM            {}
6378
6349
        | COLUMN_FORMAT_SYM        {}
6379
6350
        | COLUMNS                  {}
6385
6356
        | CONNECTION_SYM           {}
6386
6357
        | CONSISTENT_SYM           {}
6387
6358
        | CONTEXT_SYM              {}
6388
 
        | CONTRIBUTORS_SYM         {}
6389
 
        | CPU_SYM                  {}
6390
6359
        | CUBE_SYM                 {}
6391
6360
        | DATA_SYM                 {}
6392
6361
        | DATAFILE_SYM             {}
6393
6362
        | DATETIME                 {}
6394
6363
        | DATE_SYM                 {}
6395
6364
        | DAY_SYM                  {}
6396
 
        | DEFINER_SYM              {}
6397
6365
        | DELAY_KEY_WRITE_SYM      {}
6398
 
        | DES_KEY_FILE             {}
6399
6366
        | DIRECTORY_SYM            {}
6400
6367
        | DISABLE_SYM              {}
6401
6368
        | DISCARD                  {}
6405
6372
        | ENDS_SYM                 {}
6406
6373
        | ENUM                     {}
6407
6374
        | ENGINE_SYM               {}
6408
 
        | ENGINES_SYM              {}
6409
6375
        | ERRORS                   {}
6410
6376
        | ESCAPE_SYM               {}
6411
6377
        | EVENTS_SYM               {}
6412
 
        | EVERY_SYM                {}
6413
6378
        | EXCLUSIVE_SYM            {}
6414
6379
        | EXTENDED_SYM             {}
6415
6380
        | EXTENT_SIZE_SYM          {}
6431
6396
        | IMPORT                   {}
6432
6397
        | INDEXES                  {}
6433
6398
        | INITIAL_SIZE_SYM         {}
6434
 
        | IO_SYM                   {}
6435
 
        | IPC_SYM                  {}
6436
6399
        | ISOLATION                {}
6437
 
        | ISSUER_SYM               {}
6438
6400
        | INSERT_METHOD            {}
6439
6401
        | KEY_BLOCK_SIZE           {}
6440
6402
        | LAST_SYM                 {}