1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-17320 add Feature_application_time_periods status variable

Browse Source 
Closes #1225
This commit is contained in:
Nikita Malyavin 2019-03-22 21:08:34 +10:00 committed by Sergei Golubchik
parent 5fc6ad95d4
commit 610ec192ec
6 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/main/features.result
View File

@ -3,6 +3,7 @@ set sql_mode="";
flush status; flush status;
show status like "feature%"; show status like "feature%";
Variable_name Value Variable_name Value
Feature_application_time_periods 0
Feature_check_constraint 0 Feature_check_constraint 0
Feature_custom_aggregate_functions 0 Feature_custom_aggregate_functions 0
Feature_delay_key_write 0 Feature_delay_key_write 0

3
mysql-test/suite/period/r/create.result
View File

@ -93,4 +93,7 @@ t CREATE TABLE `t` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert t values (2, '2001-01-01', '2001-01-01'); insert t values (2, '2001-01-01', '2001-01-01');
ERROR 23000: CONSTRAINT `mytime_1` failed for `test`.`t` ERROR 23000: CONSTRAINT `mytime_1` failed for `test`.`t`
show status like "Feature_application_time_periods";
Variable_name Value
Feature_application_time_periods 6
create or replace database test; create or replace database test;

2
mysql-test/suite/period/t/create.test
View File

@ -77,4 +77,6 @@ show create table t;
--error ER_CONSTRAINT_FAILED --error ER_CONSTRAINT_FAILED
insert t values (2, '2001-01-01', '2001-01-01'); insert t values (2, '2001-01-01', '2001-01-01');
show status like "Feature_application_time_periods";
create or replace database test; create or replace database test;

1
sql/mysqld.cc
View File

@ -7666,6 +7666,7 @@ SHOW_VAR status_vars[]= {
{"Feature_locale", (char*) offsetof(STATUS_VAR, feature_locale), 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_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_timezone", (char*) offsetof(STATUS_VAR, feature_timezone), SHOW_LONG_STATUS},
{"Feature_trigger", (char*) offsetof(STATUS_VAR, feature_trigger), SHOW_LONG_STATUS}, {"Feature_trigger", (char*) offsetof(STATUS_VAR, feature_trigger), SHOW_LONG_STATUS},
{"Feature_window_functions", (char*) offsetof(STATUS_VAR, feature_window_functions), SHOW_LONG_STATUS}, {"Feature_window_functions", (char*) offsetof(STATUS_VAR, feature_window_functions), SHOW_LONG_STATUS},

2
sql/sql_class.h
View File

@ -862,6 +862,8 @@ typedef struct system_status_var
ulong feature_locale; /* +1 when LOCALE is set */ ulong feature_locale; /* +1 when LOCALE is set */
ulong feature_subquery; /* +1 when subqueries are used */ 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 a table WITH SYSTEM VERSIONING */
ulong feature_application_time_periods;
/* +1 opening a table with application-time period */
ulong feature_timezone; /* +1 when XPATH is used */ ulong feature_timezone; /* +1 when XPATH is used */
ulong feature_trigger; /* +1 opening a table with triggers */ ulong feature_trigger; /* +1 opening a table with triggers */
ulong feature_xml; /* +1 when XPATH is used */ ulong feature_xml; /* +1 when XPATH is used */

1
sql/table.cc
View File

@ -2108,6 +2108,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
if (init_period_from_extra2(&period, pos, end)) if (init_period_from_extra2(&period, pos, end))
goto err; goto err;
status_var_increment(thd->status_var.feature_application_time_periods);
} }
for (i=0 ; i < share->fields; i++, strpos+=field_pack_length, field_ptr++) for (i=0 ; i < share->fields; i++, strpos+=field_pack_length, field_ptr++)