diff options
| author | ingo@mysql.com <> | 2006-04-07 14:39:49 +0200 |
|---|---|---|
| committer | ingo@mysql.com <> | 2006-04-07 14:39:49 +0200 |
| commit | 2697018c5bb8c0129544c7149ff86c6751edd33b (patch) | |
| tree | 8c1401ecdaba2ce868522e92281279a2d9cd65ff /sql/sql_yacc.yy | |
| parent | 745dd7fd1f88909c399c3d43c853aa449e9a373d (diff) | |
| parent | a663acb13f88cf641c662e50886ddde8caf9683c (diff) | |
| download | mariadb-git-2697018c5bb8c0129544c7149ff86c6751edd33b.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-aid
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 28592541c98..e48748bcfa5 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -501,6 +501,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token PARAM_MARKER %token PHASE_SYM %token PLUGIN_SYM +%token PLUGINS_SYM %token POINTFROMTEXT %token POINT_SYM %token POLYFROMTEXT @@ -8175,6 +8176,15 @@ show_param: | PLUGIN_SYM { LEX *lex= Lex; + WARN_DEPRECATED(yythd, "5.2", "SHOW PLUGIN", "'SHOW PLUGINS'"); + lex->sql_command= SQLCOM_SELECT; + lex->orig_sql_command= SQLCOM_SHOW_PLUGINS; + if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) + YYABORT; + } + | PLUGINS_SYM + { + LEX *lex= Lex; lex->sql_command= SQLCOM_SELECT; lex->orig_sql_command= SQLCOM_SHOW_PLUGINS; if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) @@ -9361,7 +9371,6 @@ keyword: | OPEN_SYM {} | PARSER_SYM {} | PARTITION_SYM {} - | PLUGIN_SYM {} | PREPARE_SYM {} | REMOVE_SYM {} | REPAIR {} @@ -9542,6 +9551,8 @@ keyword_sp: | PARTITIONS_SYM {} | PASSWORD {} | PHASE_SYM {} + | PLUGIN_SYM {} + | PLUGINS_SYM {} | POINT_SYM {} | POLYGON {} | PRESERVE_SYM {} @@ -9555,7 +9566,7 @@ keyword_sp: | REBUILD_SYM {} | RECOVER_SYM {} | REDO_BUFFER_SIZE_SYM {} - | REDOFILE_SYM {} + | REDOFILE_SYM {} | REDUNDANT_SYM {} | RELAY_LOG_FILE_SYM {} | RELAY_LOG_POS_SYM {} |