Merge lp:~laurynas-biveinis/percona-server/bug1272747 into lp:percona-server/5.6

[Laurynas Biveinis]

Fix bug 1272747 (5.6 link failure with WITH_PFS=0) by providing the
missing mutex_enter_nowait_func(ib_prio_mutex_t*, const char*, ulint)
definition.

http://jenkins.percona.com/job/percona-server-5.6-param/491/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/include/sync0sync.h'
--- storage/innobase/include/sync0sync.h	2013-12-05 17:23:10 +0000
+++ storage/innobase/include/sync0sync.h	2014-01-27 13:23:45 +0000
@@ -358,7 +358,7 @@
 directly. Tries to lock the mutex for the current thread. If the lock is not
 acquired immediately, returns with return value 1.
 @return	0 if succeed, 1 if not */
-UNIV_INTERN
+UNIV_INLINE
 ulint
 mutex_enter_nowait_func(
 /*====================*/

=== modified file 'storage/innobase/include/sync0sync.ic'
--- storage/innobase/include/sync0sync.ic	2013-10-23 08:48:28 +0000
+++ storage/innobase/include/sync0sync.ic	2014-01-27 13:23:45 +0000
@@ -316,6 +316,23 @@
 	mutex_spin_wait(mutex, high_priority, file_name, line);
 }
 
+/********************************************************************//**
+NOTE! Use the corresponding macro in the header file, not this function
+directly. Tries to lock the mutex for the current thread. If the lock is not
+acquired immediately, returns with return value 1.
+@return	0 if succeed, 1 if not */
+UNIV_INLINE
+ulint
+mutex_enter_nowait_func(
+/*====================*/
+	ib_prio_mutex_t*	mutex,		/*!< in: pointer to mutex */
+	const char*		file_name,	/*!< in: file name where mutex
+						requested */
+	ulint			line)		/*!< in: line where
+					       requested */
+{
+	return mutex_enter_nowait_func(&mutex->base_mutex, file_name, line);
+}
 
 #ifdef UNIV_PFS_MUTEX
 /******************************************************************//**