diff options
| author | monty@donna.mysql.fi <> | 2001-05-05 09:44:25 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-05 09:44:25 +0300 |
| commit | 33fa6e04cc0ec389d07cf0aa59db59c8d67c41eb (patch) | |
| tree | f9a0b14ce1747892c6acfa79e194036083dbfc9b /sql | |
| parent | 223fd497c7b04ec05793a312b518d82b5ad6e356 (diff) | |
| parent | f6a36e948deedb701c8cc7352341e51c404db76d (diff) | |
| download | mariadb-git-33fa6e04cc0ec389d07cf0aa59db59c8d67c41eb.tar.gz | |
Merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/lex.h | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 6c83cb34366..d5df5ed5511 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -88,6 +88,7 @@ static SYMBOL symbols[] = { { "COMMIT", SYM(COMMIT_SYM),0,0}, { "COMMITTED", SYM(COMMITTED_SYM),0,0}, { "COMPRESSED", SYM(COMPRESSED_SYM),0,0}, + { "CONCURRENT", SYM(CONCURRENT),0,0}, { "CONSTRAINT", SYM(CONSTRAINT),0,0}, { "CREATE", SYM(CREATE),0,0}, { "CROSS", SYM(CROSS),0,0}, diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index cb89dc04c15..c1069d91746 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -145,6 +145,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token COMMITTED_SYM %token COLUMNS %token COLUMN_SYM +%token CONCURRENT %token CONSTRAINT %token DATABASES %token DATA_SYM @@ -2339,7 +2340,7 @@ use: USE_SYM ident /* import, export of files */ -load: LOAD DATA_SYM opt_low_priority opt_local INFILE TEXT_STRING +load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING { Lex->sql_command= SQLCOM_LOAD; Lex->local_file= $4; @@ -2366,6 +2367,12 @@ opt_local: /* empty */ { $$=0;} | LOCAL_SYM { $$=1;} +load_data_lock: + /* empty */ { Lex->lock_option= current_thd->update_lock_default; } + | CONCURRENT { Lex->lock_option= TL_WRITE_CONCURRENT_INSERT ; } + | LOW_PRIORITY { Lex->lock_option= TL_WRITE_LOW_PRIORITY; } + + opt_duplicate: /* empty */ { Lex->duplicates=DUP_ERROR; } | REPLACE { Lex->duplicates=DUP_REPLACE; } @@ -2523,6 +2530,7 @@ keyword: | COMMIT_SYM {} | COMMITTED_SYM {} | COMPRESSED_SYM {} + | CONCURRENT {} | DATA_SYM {} | DATETIME {} | DATE_SYM {} |