summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-27 22:26:58 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-27 22:26:58 +0100
commitcb67dcb6184535349ca4ff3d7c64eba9c63a0688 (patch)
tree10d38ccf7fe60d5ea5c866d37292833b77dfcdae /sql/mysqld.h
parent44002a34e680c79c01df879b540458c2885e97e8 (diff)
parentfaec0e2f4aecfc902e354ae7af991779d6bfc4a7 (diff)
downloadmariadb-git-cb67dcb6184535349ca4ff3d7c64eba9c63a0688.tar.gz
mysql-5.5.37 selective merge
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 56c48d3d23f..152f42d6ea0 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -435,7 +435,7 @@ extern my_atomic_rwlock_t global_query_id_lock;
void unireg_end(void) __attribute__((noreturn));
/* increment query_id and return it. */
-inline query_id_t next_query_id()
+inline __attribute__((warn_unused_result)) query_id_t next_query_id()
{
query_id_t id;
my_atomic_rwlock_wrlock(&global_query_id_lock);