diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 19:21:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 19:21:23 +0100 |
| commit | ac585e9ed5d4073b023387c77f90c278f137e469 (patch) | |
| tree | 852de46e59c6763c02647a28f87af76df6d1c582 /storage/xtradb/os/os0thread.cc | |
| parent | 6bc7bd0eb233aa08702bcc0f0c3ca8b73fc32294 (diff) | |
| parent | b338c8eb56d92bc3a5f4665ad74e93a840eb96d3 (diff) | |
| download | mariadb-git-ac585e9ed5d4073b023387c77f90c278f137e469.tar.gz | |
Percona-Server-5.6.15-rel63.0.tar.gz merge
Diffstat (limited to 'storage/xtradb/os/os0thread.cc')
| -rw-r--r-- | storage/xtradb/os/os0thread.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/xtradb/os/os0thread.cc b/storage/xtradb/os/os0thread.cc index 685e89d48be..13099e243cd 100644 --- a/storage/xtradb/os/os0thread.cc +++ b/storage/xtradb/os/os0thread.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -203,6 +203,9 @@ os_thread_create_func( #ifndef UNIV_HPUX10 pthread_attr_destroy(&attr); #endif + + ut_a(os_thread_count <= OS_THREAD_MAX_N); + if (thread_id) { *thread_id = pthread; } |