Commit 5b13df34 authored by Leigh Stoller's avatar Leigh Stoller

Fix mysql 5.7 "order by" complaints.

parent c67779ca
<?php
#
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -81,7 +81,7 @@ else {
}
$query =
"select distinct iv.* from images as i ".
"select distinct iv.*,i.imagename from images as i ".
"left join image_versions as iv on ".
" iv.imageid=i.imageid and iv.version=i.version ".
"left join os_info_versions as ov on ".
......
<?php
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -57,7 +57,7 @@ if (isset($creator)) {
#
if ($isadmin) {
$query_result =
DBQueryFatal("SELECT distinct v.* FROM os_info as o ".
DBQueryFatal("SELECT distinct v.*,o.osname FROM os_info as o ".
"left join os_info_versions as v on ".
" v.osid=o.osid and v.vers=o.version ".
"where 1 $extraclause ".
......@@ -67,7 +67,7 @@ else {
$uid_idx = $this_user->uid_idx();
$query_result =
DBQueryFatal("select distinct v.* from os_info as o ".
DBQueryFatal("select distinct v.*,o.osname from os_info as o ".
"left join os_info_versions as v on ".
" v.osid=o.osid and v.vers=o.version ".
"left join image_permissions as p1 on ".
......
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