← 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: 2008-08-05 06:19:05 UTC
  • mfrom: (244.1.1 drizzle-mem-ebay)
  • mto: This revision was merged to the branch mainline in revision 264.
  • Revision ID: brian@tangent.org-20080805061905-1r8krslxae65qh76
Merge from Harrison Fisk of the Ebay + Google Hash engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
416
416
%token  BIN_NUM
417
417
%token  BIT_SYM                       /* MYSQL-FUNC */
418
418
%token  BLOB_SYM                      /* SQL-2003-R */
 
419
%token  BLOCK_SIZE_SYM
419
420
%token  BLOCK_SYM
420
421
%token  BOOLEAN_SYM                   /* SQL-2003-R */
421
422
%token  BOOL_SYM
1483
1484
            Lex->create_info.avg_row_length=$3;
1484
1485
            Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;
1485
1486
          }
 
1487
        | BLOCK_SIZE_SYM opt_equal ulong_num    
 
1488
          { 
 
1489
            Lex->create_info.block_size= $3; 
 
1490
            Lex->create_info.used_fields|= HA_CREATE_USED_BLOCK_SIZE;
 
1491
          }
1486
1492
        | COMMENT_SYM opt_equal TEXT_STRING_sys
1487
1493
          {
1488
1494
            Lex->create_info.comment=$3;
6341
6347
        | AVG_SYM                  {}
6342
6348
        | BINLOG_SYM               {}
6343
6349
        | BIT_SYM                  {}
 
6350
        | BLOCK_SIZE_SYM           {}
6344
6351
        | BLOCK_SYM                {}
6345
6352
        | BOOL_SYM                 {}
6346
6353
        | BOOLEAN_SYM              {}