mysql-5.5.37 selective merge

This commit is contained in:
Sergei Golubchik 2014-03-27 22:26:58 +01:00
commit cb67dcb618
1335 changed files with 3710 additions and 722 deletions

View file

@ -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);