diff -ur gjukebox.puck.v2/scripts/ChangeLog gjukebox.puck.v3/scripts/ChangeLog
--- gjukebox.puck.v2/scripts/ChangeLog	2003-06-13 15:57:15.000000000 +1200
+++ gjukebox.puck.v3/scripts/ChangeLog	2003-10-06 17:51:15.000000000 +1300
@@ -1,3 +1,9 @@
+2003-10-06  Andrew Ruthven  <andrew@etc.gen.nz>
+
+	* getnextmp3.pl: Change one the queries to use the SQL92 standard
+	  OR and AND for the logic in a WHERE clause.  Rather than the MySQL
+	  approach of using || and &&.
+
 2003-05-13  Andrew Ruthven  <andrew@cyclops.etc.gen.nz>
 
 	* getnextmp3.pl: Wow, lot's of places where user is queried from the
diff -ur gjukebox.puck.v2/scripts/getnextmp3.pl gjukebox.puck.v3/scripts/getnextmp3.pl
--- gjukebox.puck.v2/scripts/getnextmp3.pl	2003-10-29 00:03:46.000000000 +1300
+++ gjukebox.puck.v3/scripts/getnextmp3.pl	2003-10-06 17:49:43.000000000 +1300
@@ -307,7 +307,7 @@
 
 if ($ARGV[0] eq "peek") {
   my $sth=$dbh->prepare("select queue.queueid,queue.id,songs.file,songs.difvol,songs.length,songs.format,a.mounted,a.id,a.flags from queue left join songs on queue.id = songs.id ".
-                        "left join volumes a on a.id = songs.volid where pri = 0 and queue.username $queue and (a.id is null || (length(a.mounted)>0 && (a.flags&2)=2)) order by pri,queueid limit 1");
+                        "left join volumes a on a.id = songs.volid where pri = 0 and queue.username $queue and (a.id is null OR (length(a.mounted)>0 AND (a.flags&2)=2)) order by pri,queueid limit 1");
   $sth->execute;
   my ($queueid,$id,$file,$difvol,$length,$format,$mounted,$volid,$volflags)=$sth->fetchrow_array;
   if (defined $id) {