Commit 127e7585 authored by Marc Alff's avatar Marc Alff

Push to mysql-5.5

parents 7c69ec0a 4f5e7582
/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -988,7 +988,7 @@ static inline int inline_mysql_cond_wait( ...@@ -988,7 +988,7 @@ static inline int inline_mysql_cond_wait(
static inline int inline_mysql_cond_timedwait( static inline int inline_mysql_cond_timedwait(
mysql_cond_t *that, mysql_cond_t *that,
mysql_mutex_t *mutex, mysql_mutex_t *mutex,
struct timespec *abstime const struct timespec *abstime
#ifdef HAVE_PSI_INTERFACE #ifdef HAVE_PSI_INTERFACE
, const char *src_file, uint src_line , const char *src_file, uint src_line
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment