--- thr_lock.c.orig	2015-06-27 15:55:53.000000000 -0700
+++ thr_lock.c	2015-06-27 15:58:01.000000000 -0700
@@ -1792,6 +1792,10 @@
   for (i=0 ; i < array_elements(lock_counts) ; i++)
   {
     param=(int*) malloc(sizeof(int));
+		if (param == NULL) {
+			fprintf(stderr, "Unable to allocate memory for mysql_mutex_lock (errno: %d)\n", errno);
+			exit(1);
+		}
     *param=i;
 
     if ((error= mysql_mutex_lock(&LOCK_thread_count)))