Fix insert delated + query cache.

Fix pthread_mutex_trylock on HPUX (needed for query cache).


include/my_pthread.h:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
mysql-test/mysql-test-run.sh:
  Wait for .pid file instead of .sock, because .pid is created later.
mysql-test/r/query_cache.result:
  Test insert delated + query cache
mysql-test/t/query_cache.test:
  Test insert delated + query cache
mysys/my_pthread.c:
  Fixed mutex problem with pthread_mutex_trylock on HPUX.
sql/repl_failsafe.cc:
  Safety
sql/sql_insert.cc:
  Fix insert delated + query cache

1 files changed, 2 insertions, 0 deletions

diff --git a/include/my_pthread.h b/include/my_pthread.h
index e6cd039c80e..4ca42339897 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -448,8 +448,10 @@ struct hostent *my_gethostbyname_r(const char *name,
 
 #if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
 #define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
+#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) 
 int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
 			      struct timespec *abstime);
+int my_pthread_mutex_trylock(pthread_mutex_t *mutex);
 #endif
 
 	/* safe_mutex adds checking to mutex for easier debugging */