Merge lp:~akopytov/percona-xtrabackup/bug722638-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-1.6-param/51/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-09-21 09:00:00 +0000
+++ xtrabackup.c	2011-09-21 21:06:26 +0000
@@ -1156,6 +1156,17 @@
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
+#ifndef __WIN__
+static int debug_sync_resumed;
+
+static void sigcont_handler(int sig);
+
+static void sigcont_handler(int sig __attribute__((unused)))
+{
+	debug_sync_resumed= 1;
+}
+#endif
+
 UNIV_INLINE
 void
 debug_sync_point(const char *name)
@@ -1190,9 +1201,14 @@
 		"Suspending at debug sync point '%s'. "
 		"Resume with 'kill -SIGCONT %u'.\n", name, (uint) pid);
 
+	debug_sync_resumed= 0;
 	kill(pid, SIGSTOP);
+	while (!debug_sync_resumed) {
+		sleep(1);
+	}
 
 	/* On resume */
+	fprintf(stderr, "xtrabackup: DEBUG: removing the pid file.\n");
 	my_delete(pid_path, MYF(MY_WME));
 #endif
 }
@@ -6215,6 +6231,12 @@
 		}
 	}
 
+#ifndef __WIN__
+	if (xtrabackup_debug_sync) {
+		signal(SIGCONT, sigcont_handler);
+	}
+#endif
+
 	/* --backup */
 	if (xtrabackup_backup)
 		xtrabackup_backup_func();