Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove 550+ compile warnings on OS X

Author: cjbj

ext/mysqlnd/mysqlnd_debug.h

@@ -126,7 +126,8 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC);
 					if ((dbg_obj2)) { \
 						dbg_skip_trace |= !(dbg_obj2)->m->func_enter((dbg_obj2), __LINE__, __FILE__, func_name, strlen(func_name)); \
 					} \
-					if (dbg_skip_trace); /* shut compiler's mouth */\
+					if (dbg_skip_trace) \
+						/* EMPTY */ ; /* shut compiler's mouth */	\
 					do { \
 						if (((dbg_obj1) && (dbg_obj1)->flags & MYSQLND_DEBUG_PROFILE_CALLS) || \
 							((dbg_obj2) && (dbg_obj2)->flags & MYSQLND_DEBUG_PROFILE_CALLS)) \