← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2009-08-24 19:19:39 UTC
  • mfrom: (1121.1.6 merge)
  • Revision ID: brian@gaz-20090824191939-xcn528r7gwjc48h3
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
396
396
  enum ha_rkey_function ha_rkey_mode;
397
397
  enum enum_tx_isolation tx_isolation;
398
398
  enum Cast_target cast_type;
399
 
  enum ha_choice choice;
400
399
  const CHARSET_INFO *charset;
401
400
  thr_lock_type lock_type;
402
401
  interval_type interval, interval_time_st;
540
539
%token  DESC                          /* SQL-2003-N */
541
540
%token  DESCRIBE                      /* SQL-2003-R */
542
541
%token  DETERMINISTIC_SYM             /* SQL-2003-R */
543
 
%token  DIRECTORY_SYM
544
542
%token  DISABLE_SYM
545
543
%token  DISCARD
546
544
%token  DISTINCT                      /* SQL-2003-R */
933
931
%type <ulonglong_number>
934
932
        ulonglong_num
935
933
 
936
 
%type <choice> choice
937
 
 
938
934
%type <lock_type>
939
935
        load_data_lock
940
936
 
1385
1381
            Lex->alter_info.flags.set(ALTER_ROW_FORMAT);
1386
1382
          }
1387
1383
        | default_collation
1388
 
        | DATA_SYM DIRECTORY_SYM opt_equal TEXT_STRING_sys
1389
 
          {
1390
 
            Lex->create_info.data_file_name= $4.str;
1391
 
            Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR;
1392
 
          }
1393
 
        | INDEX_SYM DIRECTORY_SYM opt_equal TEXT_STRING_sys
1394
 
          {
1395
 
            Lex->create_info.index_file_name= $4.str;
1396
 
            Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR;
1397
 
          }
1398
 
        | CONNECTION_SYM opt_equal TEXT_STRING_sys
1399
 
          {
1400
 
            Lex->create_info.connect_string.str= $3.str;
1401
 
            Lex->create_info.connect_string.length= $3.length;
1402
 
            Lex->create_info.used_fields|= HA_CREATE_USED_CONNECTION;
1403
 
          }
1404
1384
        | KEY_BLOCK_SIZE opt_equal ulong_num
1405
1385
          {
1406
1386
            Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE;
4252
4232
        | FLOAT_NUM
4253
4233
        ;
4254
4234
 
4255
 
choice:
4256
 
        ulong_num { $$= $1 != 0 ? HA_CHOICE_YES : HA_CHOICE_NO; }
4257
 
        | DEFAULT { $$= HA_CHOICE_UNDEF; }
4258
 
        ;
4259
 
 
4260
4235
select_var_list_init:
4261
4236
          {
4262
4237
            LEX *lex=Lex;
5552
5527
        | DATETIME_SYM             {}
5553
5528
        | DATE_SYM                 {}
5554
5529
        | DAY_SYM                  {}
5555
 
        | DIRECTORY_SYM            {}
5556
5530
        | DISABLE_SYM              {}
5557
5531
        | DISCARD                  {}
5558
5532
        | DUMPFILE                 {}