mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Print WAL position correctly in pg_rewind error message.
This has been wrong ever since pg_rewind was added. The if-branch just above this, where we print the same error with an extra message supplied by XLogReadRecord() got this right, but the variable name was wrong in the else-branch. As a consequence, the error printed the WAL position as 0/0 if there was an error reading a WAL file. Backpatch to 9.5, where pg_rewind was added.
This commit is contained in:
		@@ -89,8 +89,7 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, TimeLineID tli,
 | 
				
			|||||||
						 errormsg);
 | 
											 errormsg);
 | 
				
			||||||
			else
 | 
								else
 | 
				
			||||||
				pg_fatal("could not read WAL record at %X/%X\n",
 | 
									pg_fatal("could not read WAL record at %X/%X\n",
 | 
				
			||||||
						 (uint32) (startpoint >> 32),
 | 
											 (uint32) (errptr >> 32), (uint32) (errptr));
 | 
				
			||||||
						 (uint32) (startpoint));
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		extractPageInfo(xlogreader);
 | 
							extractPageInfo(xlogreader);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user