Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main.slony.info:/tmp/cvs-serv12176/src/slonik

Modified Files:
	slonik.c 
Log Message:
Fix SYNC so that WAIT FOR EVENT finally works.

Jan


Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** slonik.c	18 Apr 2007 15:03:51 -0000	1.75
--- slonik.c	15 May 2007 19:40:16 -0000	1.76
***************
*** 3973,3977 ****
--- 3973,3987 ----
  			 */
  			if (adminfo->last_event < 0)
+ 			{
+ 				if (adminfo->no_id == stmt->wait_origin)
+ 				{
+ 					printf("%s:%d: Error: "
+ 					   "script did not generate any event on node %d\n",
+ 							   stmt->hdr.stmt_filename, stmt->hdr.stmt_lno,
+ 							   stmt->wait_origin);
+ 					return -1;
+ 				}
  				continue;
+ 			}
  
  			if (stmt->wait_confirmed < 0)
***************
*** 4096,4100 ****
  				 stmt->hdr.script->clustername,
  				 stmt->hdr.script->clustername);
! 	if (db_exec_command((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{
  		dstring_free(&query);
--- 4106,4110 ----
  				 stmt->hdr.script->clustername,
  				 stmt->hdr.script->clustername);
! 	if (db_exec_evcommand((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{
  		dstring_free(&query);