summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.h')
-rw-r--r--sql/mysqld.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h
index e581b413e0d..f500a0abf3f 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -438,7 +438,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);
@@ -447,16 +447,6 @@ inline query_id_t next_query_id()
return (id+1);
}
-inline query_id_t get_query_id()
-{
- query_id_t id;
- my_atomic_rwlock_wrlock(&global_query_id_lock);
- id= my_atomic_load64(&global_query_id);
- my_atomic_rwlock_wrunlock(&global_query_id_lock);
- return id;
-}
-
-
/*
TODO: Replace this with an inline function.
*/