diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-11 18:47:27 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-11 18:47:27 -0700 |
| commit | e0e0f9e3d46917fe9b611fc9769e64032c267446 (patch) | |
| tree | c111d4c62b1e1eb7a74ec68860756418e29cb61e /sql/item_func.cc | |
| parent | 3d915225611a921fad03934e58bf281b48fc15b0 (diff) | |
| download | mariadb-git-e0e0f9e3d46917fe9b611fc9769e64032c267446.tar.gz | |
WL#2360 Performance schema
Part V: performance schema implementation
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 557561789b2..f9d9522fbbc 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3502,7 +3502,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout) @param lock the associated mutex @param abstime the amount of time in seconds to wait - @retval return value from pthread_cond_timedwait + @retval return value from mysql_cond_timedwait */ #define INTERRUPT_INTERVAL (5 * ULL(1000000000)) @@ -3822,7 +3822,7 @@ longlong Item_func_sleep::val_int() timeout= args[0]->val_real(); /* - On 64-bit OSX pthread_cond_timedwait() waits forever + On 64-bit OSX mysql_cond_timedwait() waits forever if passed abstime time has already been exceeded by the system time. When given a very short timeout (< 10 mcs) just return |