Commit 0c61f2f5 authored by Mike Hibler's avatar Mike Hibler

Fix another GROUP BY clause for mysql 5.7.

(But then I just if-0'ed out the whole planetlab related query).
parent c151a723
......@@ -1319,7 +1319,7 @@ sub doSwapin($) {
# If there are any Plab dslice nodes in the experiment, create the
# dslice now
#
if ($type > MODIFY_RECOVER) {
if (0 && $type > MODIFY_RECOVER) {
# Are there any Plab nodes? First get a list of node types in the exp;
# if any are types hosted by any of the PLCs we know about, create
# all slices necessary for the experiment in a single plabslice call.
......@@ -1331,7 +1331,7 @@ sub doSwapin($) {
" on nt.type = ppi.node_type".
" where r.pid='$pid' and r.eid='$eid'".
" and ppi.node_type is not NULL".
" group by nt.type");
" group by nt.type,ppi.plc_name");
if ($db_result->numrows) {
my $info_str = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment