← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2008-08-03 21:31:14 UTC
  • mfrom: (258 drizzle)
  • mto: This revision was merged to the branch mainline in revision 261.
  • Revision ID: monty@inaugust.com-20080803213114-wz24sd8ucryze5o9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

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