~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2011-01-09 08:30:17 UTC
  • mfrom: (2065.1.2 clean)
  • Revision ID: brian@tangent.org-20110109083017-het3tupt0x0opcoa
Rollup of changes from staging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
367
367
  enum drizzled::sql_var_t var_type;
368
368
  drizzled::Key::Keytype key_type;
369
369
  enum drizzled::ha_key_alg key_alg;
370
 
  enum drizzled::column_format_type column_format_type;
371
370
  enum drizzled::ha_rkey_function ha_rkey_mode;
372
371
  enum drizzled::enum_tx_isolation tx_isolation;
373
372
  enum drizzled::Cast_target cast_type;
399
398
  Currently there are 88 shift/reduce conflicts.
400
399
  We should not introduce new conflicts any more.
401
400
*/
402
 
%expect 77
 
401
%expect 75
403
402
 
404
403
/*
405
404
   Comments for TOKENS.
534
533
%token  EXTENDED_SYM
535
534
%token  EXTRACT_SYM                   /* SQL-2003-N */
536
535
%token  FALSE_SYM                     /* SQL-2003-R */
537
 
%token  COLUMN_FORMAT_SYM
538
536
%token  FILE_SYM
539
537
%token  FIRST_SYM                     /* SQL-2003-N */
540
538
%token  FIXED_SYM
913
911
 
914
912
%type <interval_time_st> interval_time_stamp
915
913
 
916
 
%type <column_format_type> column_format_types
917
 
 
918
914
%type <tx_isolation> isolation_types
919
915
 
920
916
%type <cast_type> cast_type
1361
1357
          }
1362
1358
        ;
1363
1359
 
1364
 
column_format_types:
1365
 
          DEFAULT     { $$= COLUMN_FORMAT_TYPE_DEFAULT; }
1366
 
        | FIXED_SYM   { $$= COLUMN_FORMAT_TYPE_FIXED; }
1367
 
        | DYNAMIC_SYM { $$= COLUMN_FORMAT_TYPE_DYNAMIC; };
1368
 
 
1369
 
 
1370
1360
opt_select_from:
1371
1361
          opt_limit_clause {}
1372
1362
        | select_from select_lock_type
1801
1791
              constraints->set_is_nullable(true);
1802
1792
            }
1803
1793
          }
1804
 
        | COLUMN_FORMAT_SYM column_format_types
1805
 
          {
1806
 
            statement::AlterTable *statement= (statement::AlterTable *)Lex->statement;
1807
 
 
1808
 
            statement->column_format= $2;
1809
 
            statement->alter_info.flags.set(ALTER_COLUMN_FORMAT);
1810
 
          }
1811
1794
        | not NULL_SYM
1812
1795
          {
1813
1796
            Lex->type|= NOT_NULL_FLAG;
2075
2058
 
2076
2059
key_using_alg:
2077
2060
          USING btree_or_rtree     { ((statement::CreateTable *)Lex->statement)->key_create_info.algorithm= $2; }
2078
 
        | TYPE_SYM btree_or_rtree  { ((statement::CreateTable *)Lex->statement)->key_create_info.algorithm= $2; }
2079
2061
        ;
2080
2062
 
2081
2063
key_opt:
5964
5946
        | CHAIN_SYM                {}
5965
5947
        | COALESCE                 {}
5966
5948
        | COLLATION_SYM            {}
5967
 
        | COLUMN_FORMAT_SYM        {}
5968
5949
        | COLUMNS                  {}
5969
5950
        | COMMITTED_SYM            {}
5970
5951
        | COMPACT_SYM              {}
5971
5952
        | COMPRESSED_SYM           {}
5972
5953
        | CONCURRENT               {}
5973
 
        | CONNECTION_SYM           {}
 
5954
        | CONNECTION_SYM           {} /* Causes conflict because of kill */
5974
5955
        | CONSISTENT_SYM           {}
5975
5956
        | CUBE_SYM                 {}
5976
5957
        | DATA_SYM                 {}