mariadb-corporation
diff --git a/‎dbcon/joblist/joblistfactory.cpp
+4-2 b/‎dbcon/joblist/joblistfactory.cpp
+4-2
@@ -1129,7 +1129,8 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo
             else
               it = pcv.insert(pcv.end(), srcp);
 
-            projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);
+            auto placeToInsert = std::distance(pcv.begin(), it);
+            projectKeys.insert(projectKeys.begin() + std::min(placeToInsert, projectKeys.end() - projectKeys.begin()), tupleKey);
           }
           else if (doDistinct)  // @bug4250, move forward distinct column if necessary.
           {
@@ -1300,7 +1301,8 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo
         else
           it = pcv.insert(pcv.end(), srcp);
 
-        projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);
+        auto placeToInsert = std::distance(pcv.begin(), it);
+        projectKeys.insert(projectKeys.begin() + std::min(placeToInsert, projectKeys.end() - projectKeys.begin()), tupleKey);
       }
       else if (doDistinct)  // @bug4250, move forward distinct column if necessary.
       {
Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,8 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo`
`1129`	`1129`	`else`
`1130`	`1130`	`it = pcv.insert(pcv.end(), srcp);`
`1131`	`1131`
`1132`		`- projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);`
	`1132`	`+ auto placeToInsert = std::distance(pcv.begin(), it);`
	`1133`	`+ projectKeys.insert(projectKeys.begin() + std::min(placeToInsert, projectKeys.end() - projectKeys.begin()), tupleKey);`
`1133`	`1134`	`}`
`1134`	`1135`	`else if (doDistinct) // @bug4250, move forward distinct column if necessary.`
`1135`	`1136`	`{`
`@@ -1300,7 +1301,8 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo`
`1300`	`1301`	`else`
`1301`	`1302`	`it = pcv.insert(pcv.end(), srcp);`
`1302`	`1303`
`1303`		`- projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);`
	`1304`	`+ auto placeToInsert = std::distance(pcv.begin(), it);`
	`1305`	`+ projectKeys.insert(projectKeys.begin() + std::min(placeToInsert, projectKeys.end() - projectKeys.begin()), tupleKey);`
`1304`	`1306`	`}`
`1305`	`1307`	`else if (doDistinct) // @bug4250, move forward distinct column if necessary.`
`1306`	`1308`	`{`