← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_yacc.yy

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_yacc.yy
529
529
%token  DIRECTORY_SYM
530
530
%token  DISABLE_SYM
531
531
%token  DISCARD
532
 
%token  DISK_SYM
533
532
%token  DISTINCT                      /* SQL-2003-R */
534
533
%token  DIV_SYM
535
534
%token  DOUBLE_SYM                    /* SQL-2003-R */
676
675
%token  MEDIUMBLOB
677
676
%token  MEDIUMTEXT
678
677
%token  MEDIUM_SYM
679
 
%token  MEMORY_SYM
680
678
%token  MERGE_SYM                     /* SQL-2003-R */
681
679
%token  MICROSECOND_SYM               /* MYSQL-FUNC */
682
680
%token  MIGRATE_SYM
1401
1399
          }
1402
1400
        ;
1403
1401
 
1404
 
 
1405
 
/*
1406
 
  End tablespace part
1407
 
*/
1408
 
 
1409
1402
create2:
1410
1403
          '(' create2a {}
1411
1404
        | opt_create_table_options
1555
1548
            Lex->create_info.avg_row_length=$3;
1556
1549
            Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;
1557
1550
          }
1558
 
        | PASSWORD opt_equal TEXT_STRING_sys
1559
 
          {
1560
 
            Lex->create_info.password=$3.str;
1561
 
            Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD;
1562
 
          }
1563
1551
        | COMMENT_SYM opt_equal TEXT_STRING_sys
1564
1552
          {
1565
1553
            Lex->create_info.comment=$3;
1837
1825
            lex->default_value= lex->on_update_value= 0;
1838
1826
            lex->comment=null_lex_str;
1839
1827
            lex->charset=NULL;
1840
 
            lex->storage_type= HA_SM_DEFAULT;
1841
1828
            lex->column_format= COLUMN_FORMAT_TYPE_DEFAULT;
1842
1829
          }
1843
1830
          type opt_attribute
1845
1832
            LEX *lex=Lex;
1846
1833
            if (add_field_to_list(lex->thd, &$1, (enum enum_field_types) $3,
1847
1834
                                  lex->length,lex->dec,lex->type,
1848
 
                                  lex->storage_type, lex->column_format,
 
1835
                                  lex->column_format,
1849
1836
                                  lex->default_value, lex->on_update_value, 
1850
1837
                                  &lex->comment,
1851
1838
                                  lex->change,&lex->interval_list,lex->charset))
2092
2079
 
2093
2080
attribute:
2094
2081
          NULL_SYM { Lex->type&= ~ NOT_NULL_FLAG; }
2095
 
        | STORAGE_SYM DEFAULT
2096
 
          {
2097
 
            Lex->storage_type= HA_SM_DEFAULT;
2098
 
            Lex->alter_info.flags|= ALTER_COLUMN_STORAGE;
2099
 
          }
2100
 
        | STORAGE_SYM DISK_SYM
2101
 
          {
2102
 
            Lex->storage_type= HA_SM_DISK;
2103
 
            Lex->alter_info.flags|= ALTER_COLUMN_STORAGE;
2104
 
          }
2105
 
        | STORAGE_SYM MEMORY_SYM
2106
 
          {
2107
 
            Lex->storage_type= HA_SM_MEMORY;
2108
 
            Lex->alter_info.flags|= ALTER_COLUMN_STORAGE;
2109
 
          }
2110
2082
        | COLUMN_FORMAT_SYM column_format_types
2111
2083
          {
2112
2084
            Lex->column_format= $2;
2565
2537
            lex->create_info.row_type= ROW_TYPE_NOT_USED;
2566
2538
            lex->alter_info.reset();
2567
2539
            lex->no_write_to_binlog= 0;
2568
 
            lex->create_info.default_storage_media= HA_SM_DEFAULT;
2569
2540
            lex->alter_info.build_method= $2;
2570
2541
          }
2571
2542
          alter_commands
2658
2629
            lex->comment=null_lex_str;
2659
2630
            lex->charset= NULL;
2660
2631
            lex->alter_info.flags|= ALTER_CHANGE_COLUMN;
2661
 
            lex->storage_type= HA_SM_DEFAULT;
2662
2632
            lex->column_format= COLUMN_FORMAT_TYPE_DEFAULT;
2663
2633
          }
2664
2634
          type opt_attribute
2667
2637
            if (add_field_to_list(lex->thd,&$3,
2668
2638
                                  (enum enum_field_types) $5,
2669
2639
                                  lex->length,lex->dec,lex->type,
2670
 
                                  lex->storage_type, lex->column_format,
 
2640
                                  lex->column_format,
2671
2641
                                  lex->default_value, lex->on_update_value,
2672
2642
                                  &lex->comment,
2673
2643
                                  $3.str, &lex->interval_list, lex->charset))
5673
5643
            lex->sql_command = SQLCOM_SHOW_CREATE;
5674
5644
            if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0))
5675
5645
              MYSQL_YYABORT;
5676
 
            lex->create_info.default_storage_media= HA_SM_DEFAULT;
5677
5646
          }
5678
5647
        | MASTER_SYM STATUS_SYM
5679
5648
          {
6624
6593
        | DIRECTORY_SYM            {}
6625
6594
        | DISABLE_SYM              {}
6626
6595
        | DISCARD                  {}
6627
 
        | DISK_SYM                 {}
6628
6596
        | DUMPFILE                 {}
6629
6597
        | DUPLICATE_SYM            {}
6630
6598
        | DYNAMIC_SYM              {}
6689
6657
        | MAX_USER_CONNECTIONS_SYM {}
6690
6658
        | MAX_VALUE_SYM            {}
6691
6659
        | MEDIUM_SYM               {}
6692
 
        | MEMORY_SYM               {}
6693
6660
        | MERGE_SYM                {}
6694
6661
        | MICROSECOND_SYM          {}
6695
6662
        | MIGRATE_SYM              {}