← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_yacc.yy

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_yacc.yy
649
649
%token  LOCK_SYM
650
650
%token  LOGFILE_SYM
651
651
%token  LOGS_SYM
652
 
%token  LONGBLOB
653
 
%token  LONGTEXT
654
652
%token  LONG_NUM
655
653
%token  LONG_SYM
656
654
%token  LOOP_SYM
676
674
%token  MAX_USER_CONNECTIONS_SYM
677
675
%token  MAX_VALUE_SYM                 /* SQL-2003-N */
678
676
%token  MEDIUMBLOB
679
 
%token  MEDIUMTEXT
680
677
%token  MEDIUM_SYM
681
678
%token  MERGE_SYM                     /* SQL-2003-R */
682
679
%token  MICROSECOND_SYM               /* MYSQL-FUNC */
715
712
%token  NVARCHAR_SYM
716
713
%token  OFFLINE_SYM
717
714
%token  OFFSET_SYM
718
 
%token  OLD_PASSWORD
719
715
%token  ON                            /* SQL-2003-R */
720
716
%token  ONE_SHOT_SYM
721
717
%token  ONE_SYM
867
863
%token  TIMESTAMP_ADD
868
864
%token  TIMESTAMP_DIFF
869
865
%token  TIME_SYM                      /* SQL-2003-R */
870
 
%token  TINYBLOB
871
866
%token  TINYINT
872
 
%token  TINYTEXT
873
867
%token  TO_SYM                        /* SQL-2003-R */
874
868
%token  TRAILING                      /* SQL-2003-R */
875
869
%token  TRANSACTION_SYM
1927
1921
          }
1928
1922
        | DATETIME
1929
1923
          { $$=MYSQL_TYPE_DATETIME; }
1930
 
        | TINYBLOB
1931
 
          {
1932
 
            Lex->charset=&my_charset_bin;
1933
 
            $$=MYSQL_TYPE_TINY_BLOB;
1934
 
          }
1935
1924
        | BLOB_SYM opt_len
1936
1925
          {
1937
1926
            Lex->charset=&my_charset_bin;
1938
1927
            $$=MYSQL_TYPE_BLOB;
1939
1928
          }
1940
 
        | MEDIUMBLOB
1941
 
          {
1942
 
            Lex->charset=&my_charset_bin;
1943
 
            $$=MYSQL_TYPE_MEDIUM_BLOB;
1944
 
          }
1945
 
        | LONGBLOB
1946
 
          {
1947
 
            Lex->charset=&my_charset_bin;
1948
 
            $$=MYSQL_TYPE_LONG_BLOB;
1949
 
          }
1950
1929
        | LONG_SYM VARBINARY
1951
1930
          {
1952
1931
            Lex->charset=&my_charset_bin;
1954
1933
          }
1955
1934
        | LONG_SYM varchar opt_binary
1956
1935
          { $$=MYSQL_TYPE_MEDIUM_BLOB; }
1957
 
        | TINYTEXT opt_binary
1958
 
          { $$=MYSQL_TYPE_TINY_BLOB; }
1959
1936
        | TEXT_SYM opt_len opt_binary
1960
1937
          { $$=MYSQL_TYPE_BLOB; }
1961
 
        | MEDIUMTEXT opt_binary
1962
 
          { $$=MYSQL_TYPE_MEDIUM_BLOB; }
1963
 
        | LONGTEXT opt_binary
1964
 
          { $$=MYSQL_TYPE_LONG_BLOB; }
1965
1938
        | DECIMAL_SYM float_options field_options
1966
1939
          { $$=MYSQL_TYPE_NEWDECIMAL;}
1967
1940
        | NUMERIC_SYM float_options field_options
3813
3786
          {
3814
3787
            THD *thd= YYTHD;
3815
3788
            Item* i1;
3816
 
            i1= new (thd->mem_root) Item_func_password($3);
 
3789
            i1= new (thd->mem_root) Item_func_password($3);
3817
3790
            $$= i1;
3818
3791
          }
3819
3792
        | QUARTER_SYM '(' expr ')'
6676
6649
        | NVARCHAR_SYM             {}
6677
6650
        | OFFLINE_SYM              {}
6678
6651
        | OFFSET_SYM               {}
6679
 
        | OLD_PASSWORD             {}
6680
6652
        | ONE_SHOT_SYM             {}
6681
6653
        | ONE_SYM                  {}
6682
6654
        | ONLINE_SYM               {}