database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-01 08:47:55 +03:00
parent c02d61bc11 1b41a54fc9
commit 6749d39a95
318 changed files with 12436 additions and 1800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.h
View File

@ -711,7 +711,7 @@ enum enum_query_type
/* query_id */
extern query_id_t global_query_id;
void unireg_end(void) __attribute__((noreturn));
ATTRIBUTE_NORETURN void unireg_end(void);
/* increment query_id and return it. */
inline __attribute__((warn_unused_result)) query_id_t next_query_id()