database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source 
Also, clean up the test innodb_gis.geometry a little further.
This commit is contained in:
Marko Mäkelä
2020-03-20 18:08:16 +02:00
parent dd68db0c17 9f7b8625e6
commit 44298e4dea
81 changed files with 2788 additions and 2808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -842,9 +842,9 @@ typedef struct system_status_var
ulong feature_window_functions; /* +1 when window functions are used */
/* From MASTER_GTID_WAIT usage */
ulonglong master_gtid_wait_timeouts; /* Number of timeouts */
ulonglong master_gtid_wait_time; /* Time in microseconds */
ulonglong master_gtid_wait_count;
ulong master_gtid_wait_timeouts; /* Number of timeouts */
ulong master_gtid_wait_time; /* Time in microseconds */
ulong master_gtid_wait_count;
ulong empty_queries;
ulong access_denied_errors;