Skip to content

Commit affab99

Browse files
vuvovamontywi
authored andcommitted
remove Feature_into_old_syntax
it doesn't provide any information we'll use. No matter what the value is, we don't remove the non-standard syntax unless we have to
1 parent 7e465ae commit affab99

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

mysql-test/main/features.result

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Feature_dynamic_columns 0
1111
Feature_fulltext 0
1212
Feature_gis 0
1313
Feature_insert_returning 0
14-
Feature_into_old_syntax 0
1514
Feature_into_outfile 0
1615
Feature_into_variable 0
1716
Feature_invisible_columns 0
@@ -208,6 +207,5 @@ select @x=@y;
208207
drop table t1;
209208
show status like "feature_into_%";
210209
Variable_name Value
211-
Feature_into_old_syntax 2
212-
Feature_into_outfile 2
210+
Feature_into_outfile 4
213211
Feature_into_variable 2

sql/mysqld.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7413,7 +7413,6 @@ SHOW_VAR status_vars[]= {
74137413
{"Feature_fulltext", (char*) offsetof(STATUS_VAR, feature_fulltext), SHOW_LONG_STATUS},
74147414
{"Feature_gis", (char*) offsetof(STATUS_VAR, feature_gis), SHOW_LONG_STATUS},
74157415
{"Feature_insert_returning", (char*)offsetof(STATUS_VAR, feature_insert_returning), SHOW_LONG_STATUS},
7416-
{"Feature_into_old_syntax", (char*) offsetof(STATUS_VAR, feature_into_old_syntax), SHOW_LONG_STATUS},
74177416
{"Feature_into_outfile", (char*) offsetof(STATUS_VAR, feature_into_outfile), SHOW_LONG_STATUS},
74187417
{"Feature_into_variable", (char*) offsetof(STATUS_VAR, feature_into_variable), SHOW_LONG_STATUS},
74197418
{"Feature_invisible_columns",(char*) offsetof(STATUS_VAR, feature_invisible_columns), SHOW_LONG_STATUS},

sql/sql_class.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,6 @@ typedef struct system_status_var
968968
ulong feature_window_functions; /* +1 when window functions are used */
969969
ulong feature_into_outfile; /* +1 when INTO OUTFILE is used */
970970
ulong feature_into_variable; /* +1 when INTO VARIABLE is used */
971-
ulong feature_into_old_syntax; /* +1 when INTO is used with old syntax*/
972971

973972
/* From MASTER_GTID_WAIT usage */
974973
ulong master_gtid_wait_timeouts; /* Number of timeouts */

sql/sql_yacc.yy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12503,7 +12503,7 @@ opt_procedure_or_into:
1250312503
| into opt_select_lock_type
1250412504
{
1250512505
$$= $2;
12506-
status_var_increment(thd->status_var.feature_into_old_syntax);
12506+
status_var_increment(thd->status_var.feature_into_outfile);
1250712507
}
1250812508
;
1250912509

0 commit comments

Comments
 (0)