diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 9 | ||||
| -rw-r--r-- | sql/sql_class.h | 13 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 9 |
3 files changed, 17 insertions, 14 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5f6fc700ca5..a2bb3605ea6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7417,12 +7417,15 @@ SHOW_VAR status_vars[]= { {"Feature_dynamic_columns", (char*) offsetof(STATUS_VAR, feature_dynamic_columns), SHOW_LONG_STATUS}, {"Feature_fulltext", (char*) offsetof(STATUS_VAR, feature_fulltext), SHOW_LONG_STATUS}, {"Feature_gis", (char*) offsetof(STATUS_VAR, feature_gis), SHOW_LONG_STATUS}, - {"Feature_insert_returning", (char*)offsetof(STATUS_VAR, feature_insert_returning), SHOW_LONG_STATUS}, - {"Feature_invisible_columns", (char*) offsetof(STATUS_VAR, feature_invisible_columns), SHOW_LONG_STATUS}, + {"Feature_insert_returning", (char*)offsetof(STATUS_VAR, feature_insert_returning), SHOW_LONG_STATUS}, + {"Feature_into_old_syntax", (char*) offsetof(STATUS_VAR, feature_into_old_syntax), SHOW_LONG_STATUS}, + {"Feature_into_outfile", (char*) offsetof(STATUS_VAR, feature_into_outfile), SHOW_LONG_STATUS}, + {"Feature_into_variable", (char*) offsetof(STATUS_VAR, feature_into_variable), SHOW_LONG_STATUS}, + {"Feature_invisible_columns",(char*) offsetof(STATUS_VAR, feature_invisible_columns), SHOW_LONG_STATUS}, {"Feature_json", (char*) offsetof(STATUS_VAR, feature_json), SHOW_LONG_STATUS}, {"Feature_locale", (char*) offsetof(STATUS_VAR, feature_locale), SHOW_LONG_STATUS}, {"Feature_subquery", (char*) offsetof(STATUS_VAR, feature_subquery), SHOW_LONG_STATUS}, - {"Feature_system_versioning", (char*) offsetof(STATUS_VAR, feature_system_versioning), SHOW_LONG_STATUS}, + {"Feature_system_versioning",(char*) offsetof(STATUS_VAR, feature_system_versioning), SHOW_LONG_STATUS}, {"Feature_application_time_periods", (char*) offsetof(STATUS_VAR, feature_application_time_periods), SHOW_LONG_STATUS}, {"Feature_timezone", (char*) offsetof(STATUS_VAR, feature_timezone), SHOW_LONG_STATUS}, {"Feature_trigger", (char*) offsetof(STATUS_VAR, feature_trigger), SHOW_LONG_STATUS}, diff --git a/sql/sql_class.h b/sql/sql_class.h index 626dd4993f9..8d569b64bce 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -952,19 +952,22 @@ typedef struct system_status_var functions are used */ ulong feature_dynamic_columns; /* +1 when creating a dynamic column */ ulong feature_fulltext; /* +1 when MATCH is used */ - ulong feature_gis; /* +1 opening a table with GIS features */ - ulong feature_invisible_columns; /* +1 opening a table with invisible column */ - ulong feature_json; /* +1 when JSON function appears in the statement */ + ulong feature_gis; /* +1 opening table with GIS features */ + ulong feature_invisible_columns; /* +1 opening table with invisible column */ + ulong feature_json; /* +1 when JSON function is used */ ulong feature_locale; /* +1 when LOCALE is set */ ulong feature_subquery; /* +1 when subqueries are used */ - ulong feature_system_versioning; /* +1 opening a table WITH SYSTEM VERSIONING */ + ulong feature_system_versioning; /* +1 opening table WITH SYSTEM VERSIONING */ ulong feature_application_time_periods; /* +1 opening a table with application-time period */ - ulong feature_insert_returning; /* +1 when INSERT...RETURNING is used */ + ulong feature_insert_returning; /* +1 when INSERT...RETURNING is used */ ulong feature_timezone; /* +1 when XPATH is used */ ulong feature_trigger; /* +1 opening a table with triggers */ ulong feature_xml; /* +1 when XPATH is used */ ulong feature_window_functions; /* +1 when window functions are used */ + ulong feature_into_outfile; /* +1 when INTO OUTFILE is used */ + ulong feature_into_variable; /* +1 when INTO VARIABLE is used */ + ulong feature_into_old_syntax; /* +1 when INTO is used with old syntax*/ /* From MASTER_GTID_WAIT usage */ ulong master_gtid_wait_timeouts; /* Number of timeouts */ diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 386b722a0a7..28c99abeb22 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -12502,13 +12502,8 @@ opt_procedure_or_into: } | into opt_select_lock_type { - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARN_DEPRECATED_SYNTAX, - ER_THD(thd, ER_WARN_DEPRECATED_SYNTAX), - "<select expression> INTO <destination>;", - "'SELECT <select list> INTO <destination>" - " FROM...'"); $$= $2; + status_var_increment(thd->status_var.feature_into_old_syntax); } ; @@ -12731,6 +12726,7 @@ into_destination: new (thd->mem_root) select_export(thd, lex->exchange)))) MYSQL_YYABORT; + status_var_increment(thd->status_var.feature_into_outfile); } opt_load_data_charset { Lex->exchange->cs= $4; } @@ -12753,6 +12749,7 @@ into_destination: | select_var_list_init { Lex->uncacheable(UNCACHEABLE_SIDEEFFECT); + status_var_increment(thd->status_var.feature_into_variable); } ; |