diff options
| author | unknown <serg@serg.mylan> | 2006-04-07 12:42:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-07 12:42:57 +0200 |
| commit | 60185396c912e783246559b086c92fe1e9f71116 (patch) | |
| tree | 933bd723c4651efbb64c9d6381f16d50e6363602 /sql | |
| parent | 12f5f09cc7f3d2f862ab7bb007da4244194495ad (diff) | |
| parent | 50814905ce2bf73b7f1b6ae296db558aba8c4b64 (diff) | |
| download | mariadb-git-60185396c912e783246559b086c92fe1e9f71116.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/lex.h | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 15 | ||||
| -rw-r--r-- | sql/table.cc | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/sql/lex.h b/sql/lex.h index 9fd8cae1325..9f0c6c4f8b7 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -396,6 +396,7 @@ static SYMBOL symbols[] = { { "PASSWORD", SYM(PASSWORD)}, { "PHASE", SYM(PHASE_SYM)}, { "PLUGIN", SYM(PLUGIN_SYM)}, + { "PLUGINS", SYM(PLUGINS_SYM)}, { "POINT", SYM(POINT_SYM)}, { "POLYGON", SYM(POLYGON)}, { "PRECISION", SYM(PRECISION)}, diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e9379ab2f18..be768d6e755 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 @@ -8172,6 +8173,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)) @@ -9358,7 +9368,6 @@ keyword: | OPEN_SYM {} | PARSER_SYM {} | PARTITION_SYM {} - | PLUGIN_SYM {} | PREPARE_SYM {} | REMOVE_SYM {} | REPAIR {} @@ -9539,6 +9548,8 @@ keyword_sp: | PARTITIONS_SYM {} | PASSWORD {} | PHASE_SYM {} + | PLUGIN_SYM {} + | PLUGINS_SYM {} | POINT_SYM {} | POLYGON {} | PRESERVE_SYM {} @@ -9552,7 +9563,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 {} diff --git a/sql/table.cc b/sql/table.cc index 4807d9d0cf0..41621a19900 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -26,8 +26,8 @@ void open_table_error(TABLE_SHARE *share, int error, int db_errno, myf errortype, int errarg); -static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, - File file); +static int open_binary_frm(THD *thd, TABLE_SHARE *share, + uchar *head, File file); static void fix_type_pointers(const char ***array, TYPELIB *point_to_type, uint types, char **names); static uint find_field(Field **fields, uint start, uint length); @@ -717,8 +717,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, keyinfo->parser= plugin_lock(&parser_name, MYSQL_FTPARSER_PLUGIN); if (! keyinfo->parser) { - my_free(buff, MYF(0)); my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), parser_name.str); + my_free(buff, MYF(0)); goto err; } } |