Index: src/backend/access/nbtree/nbtinsert.c
===================================================================
RCS file: /home/hlinnaka/pgcvsrepository/pgsql/src/backend/access/nbtree/nbtinsert.c,v
retrieving revision 1.161
diff -c -r1.161 nbtinsert.c
*** src/backend/access/nbtree/nbtinsert.c	15 Nov 2007 21:14:32 -0000	1.161
--- src/backend/access/nbtree/nbtinsert.c	16 Nov 2007 11:03:46 -0000
***************
*** 1004,1010 ****
  		xl_btree_split xlrec;
  		uint8		xlinfo;
  		XLogRecPtr	recptr;
! 		XLogRecData rdata[6];
  		XLogRecData *lastrdata;
  
  		xlrec.node = rel->rd_node;
--- 1004,1010 ----
  		xl_btree_split xlrec;
  		uint8		xlinfo;
  		XLogRecPtr	recptr;
! 		XLogRecData rdata[7];
  		XLogRecData *lastrdata;
  
  		xlrec.node = rel->rd_node;
***************
*** 1020,1034 ****
  
  		lastrdata = &rdata[0];
  
- 		/* Log downlink on non-leaf pages. */
  		if (ropaque->btpo.level > 0)
  		{
  			lastrdata->next = lastrdata + 1;
  			lastrdata++;
  
  			lastrdata->data = (char *) &newitem->t_tid.ip_blkid;
  			lastrdata->len = sizeof(BlockIdData);
  			lastrdata->buffer = InvalidBuffer;
  		}
  
  		/*
--- 1020,1044 ----
  
  		lastrdata = &rdata[0];
  
  		if (ropaque->btpo.level > 0)
  		{
+ 			/* Log downlink */
  			lastrdata->next = lastrdata + 1;
  			lastrdata++;
  
  			lastrdata->data = (char *) &newitem->t_tid.ip_blkid;
  			lastrdata->len = sizeof(BlockIdData);
  			lastrdata->buffer = InvalidBuffer;
+ 
+ 			/* Log high key of left page */
+ 			lastrdata->next = lastrdata + 1;
+ 			lastrdata++;
+ 
+ 			itemid = PageGetItemId(origpage, P_HIKEY);
+ 			item = (IndexTuple) PageGetItem(origpage, itemid);
+ 			lastrdata->data = (char *) item;
+ 			lastrdata->len = IndexTupleSize(item);
+ 			lastrdata->buffer = InvalidBuffer;
  		}
  
  		/*
Index: src/backend/access/nbtree/nbtxlog.c
===================================================================
RCS file: /home/hlinnaka/pgcvsrepository/pgsql/src/backend/access/nbtree/nbtxlog.c,v
retrieving revision 1.47
diff -c -r1.47 nbtxlog.c
*** src/backend/access/nbtree/nbtxlog.c	15 Nov 2007 21:14:32 -0000	1.47
--- src/backend/access/nbtree/nbtxlog.c	16 Nov 2007 10:59:59 -0000
***************
*** 273,278 ****
--- 273,280 ----
  	OffsetNumber newitemoff = 0;
  	Item		newitem = NULL;
  	Size		newitemsz = 0;
+ 	Item		left_hikey = NULL; /* only 16-bit aligned */
+ 	Size		left_hikeysz = 0;
  
  	reln = XLogOpenRelation(xlrec->node);
  
***************
*** 289,294 ****
--- 291,303 ----
  		datalen -= sizeof(BlockIdData);
  
  		forget_matching_split(xlrec->node, downlink, false);
+ 
+ 		/* Extract left hikey and its size (still assuming 16-bit alignment) */
+ 		left_hikey = (Item) datapos;
+ 		left_hikeysz = IndexTupleSize(left_hikey);
+ 
+ 		datapos += left_hikeysz;
+ 		datalen -= left_hikeysz;
  	}
  
  	/* Extract newitem and newitemoff, if present */
***************
*** 333,338 ****
--- 342,357 ----
  
  	_bt_restore_page(rpage, datapos, datalen);
  
+ 	/* On leaf level, the high key of the left page is equal to the
+ 	 * first key on the right page.
+ 	 */
+ 	if (xlrec->level == 0)
+ 	{
+ 		ItemId hiItemId = PageGetItemId(rpage, P_FIRSTDATAKEY(ropaque));
+ 		left_hikey = PageGetItem(rpage, hiItemId);
+ 		left_hikeysz = ItemIdGetLength(hiItemId);
+ 	}
+ 
  	PageSetLSN(rpage, lsn);
  	PageSetTLI(rpage, ThisTimeLineID);
  	MarkBufferDirty(rbuf);
***************
*** 360,367 ****
  				OffsetNumber maxoff = PageGetMaxOffsetNumber(lpage);
  				OffsetNumber deletable[MaxOffsetNumber];
  				int			ndeletable = 0;
- 				ItemId		hiItemId;
- 				Item		hiItem;
  
  				/*
  				 * Remove the items from the left page that were copied to the
--- 379,384 ----
***************
*** 394,404 ****
  						elog(PANIC, "failed to add new item to left page after split");
  				}
  
! 				/* Set high key equal to the first key on the right page */
! 				hiItemId = PageGetItemId(rpage, P_FIRSTDATAKEY(ropaque));
! 				hiItem = PageGetItem(rpage, hiItemId);
! 
! 				if (PageAddItem(lpage, hiItem, ItemIdGetLength(hiItemId),
  								P_HIKEY, false, false) == InvalidOffsetNumber)
  					elog(PANIC, "failed to add high key to left page after split");
  
--- 411,418 ----
  						elog(PANIC, "failed to add new item to left page after split");
  				}
  
! 				/* Set high key */
! 				if (PageAddItem(lpage, left_hikey, left_hikeysz,
  								P_HIKEY, false, false) == InvalidOffsetNumber)
  					elog(PANIC, "failed to add high key to left page after split");
  
Index: src/include/access/nbtree.h
===================================================================
RCS file: /home/hlinnaka/pgcvsrepository/pgsql/src/include/access/nbtree.h,v
retrieving revision 1.114
diff -c -r1.114 nbtree.h
*** src/include/access/nbtree.h	15 Nov 2007 21:14:42 -0000	1.114
--- src/include/access/nbtree.h	16 Nov 2007 10:59:59 -0000
***************
*** 289,294 ****
--- 289,298 ----
  	 * than BlockNumber for alignment reasons: SizeOfBtreeSplit is only 16-bit
  	 * aligned.)
  	 *
+ 	 * If level > 0, IndexTuple representing the HIKEY of the left page 
+ 	 * follows. We don't need it on leaf pages, because it's the same
+ 	 * as the leftmost key on the new right page.
+ 	 *
  	 * In the _L variants, next are OffsetNumber newitemoff and the new item.
  	 * (In the _R variants, the new item is one of the right page's tuples.)
  	 *