Fix mis-merge of a makeConst call.

Commit 33a1278c merged upstream addition of a typmod argument to
makeConst(). However, one of the calls was botched during the merge, and
the typmod argument was inserted to wrong place in argument list. This
seems to have been harmless because the constant ended up being NULL
anyway, and the bogus values for the other arguments were ignored.

src/backend/optimizer/prep/preptlist.c

@@ -338,7 +338,7 @@ expand_targetlist(List *tlist, int command_type,
 					if (!att_tup->attisdropped)
 					{
 						new_expr = (Node *) makeConst(atttype,
-								                      -1,
+													  -1,
 													  att_tup->attlen,
 													  (Datum) 0,
 													  true,		/* isnull */
@@ -355,11 +355,11 @@ expand_targetlist(List *tlist, int command_type,
 					{
 						/* Insert NULL for dropped column */
 						new_expr = (Node *) makeConst(INT4OID,
-								                      -1,
+													  -1,
 													  sizeof(int32),
 													  (Datum) 0,
 													  true,		/* isnull */
-													  true /* byval */);
+													  true /* byval */ );
 					}
 					break;
 				case CMD_UPDATE:
@@ -375,11 +375,11 @@ expand_targetlist(List *tlist, int command_type,
 					{
 						/* Insert NULL for dropped column */
 						new_expr = (Node *) makeConst(INT4OID,
+													  -1,
 													  sizeof(int32),
 													  (Datum) 0,
 													  true,		/* isnull */
-													  true /* byval */,
-													  -1);
+													  true /* byval */ );
 					}
 					break;
 				default: