diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
commit | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (patch) | |
tree | 31068acc0b39c208d35d524688a5985831af0447 /tests/mysql_client_fw.c | |
parent | 8a23ae088dc38f591efeab9eccdef5eb9094add9 (diff) | |
parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
download | mariadb-git-5f6380adde2dac3f32b40339b9b702c0135eb7d6.tar.gz |
10.0-base merge
Diffstat (limited to 'tests/mysql_client_fw.c')
-rw-r--r-- | tests/mysql_client_fw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index 207eaead135..90a1ea77a50 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include <my_global.h> #include <my_sys.h> @@ -30,8 +30,9 @@ and use poll()/select() to wait for them to complete. This way we can get a good coverage testing of the non-blocking API as well. */ +#include <my_context.h> static my_bool non_blocking_api_enabled= 0; -#if !defined(EMBEDDED_LIBRARY) +#if !defined(EMBEDDED_LIBRARY) && !defined(MY_CONTEXT_DISABLE) #define WRAP_NONBLOCK_ENABLED non_blocking_api_enabled #include "nonblock-wrappers.h" #endif |