Update of /cvsroot/lxr/lxr/lib/LXR/Index
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3894/lib/LXR/Index
Modified Files:
Mysql.pm
Log Message:
Fix for bug 1209273: release a reserved word in MySQL 5.x
Rename the releases.release column in the database to releases.rel,
avoiding the problem.
Index: Mysql.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Index/Mysql.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Mysql.pm 18 Oct 2004 20:45:37 -0000 1.20
+++ Mysql.pm 23 Mar 2009 12:27:18 -0000 1.21
@@ -71,16 +71,16 @@
. "where s.symid = i.symid and i.fileid = f.fileid "
. "and f.fileid = r.fileid "
. "and i.langid = d.langid and i.type = d.declid "
- . "and s.symname = ? and r.release = ?");
+ . "and s.symname = ? and r.rel = ?");
$self->{indexes_insert} =
$self->{dbh}->prepare(
"insert into ${prefix}indexes (symid, fileid, line, langid, type, relsym) values (?, ?, ?, ?, ?, ?)"
);
$self->{releases_select} =
- $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and release = ?");
+ $self->{dbh}->prepare("select * from ${prefix}releases where fileid = ? and rel = ?");
$self->{releases_insert} =
- $self->{dbh}->prepare("insert into ${prefix}releases (fileid, release) values (?, ?)");
+ $self->{dbh}->prepare("insert into ${prefix}releases (fileid, rel) values (?, ?)");
$self->{status_get} =
$self->{dbh}->prepare("select status from ${prefix}status where fileid = ?");
@@ -102,7 +102,7 @@
. "where s.symid = u.symid "
. "and f.fileid = u.fileid "
. "and u.fileid = r.fileid "
- . "and s.symname = ? and r.release = ? "
+ . "and s.symname = ? and r.rel = ? "
. "order by f.filename");
$self->{decl_select} =
$self->{dbh}->prepare(
@@ -115,24 +115,24 @@
$self->{dbh}->prepare("delete from ${prefix}indexes "
. "using ${prefix}indexes i, ${prefix}releases r "
. "where i.fileid = r.fileid "
- . "and r.release = ?");
+ . "and r.rel = ?");
$self->{delete_useage} =
$self->{dbh}->prepare("delete from ${prefix}useage "
. "using ${prefix}useage u, ${prefix}releases r "
. "where u.fileid = r.fileid "
- . "and r.release = ?");
+ . "and r.rel = ?");
$self->{delete_status} =
$self->{dbh}->prepare("delete from ${prefix}status "
. "using ${prefix}status s, ${prefix}releases r "
. "where s.fileid = r.fileid "
- . "and r.release = ?");
+ . "and r.rel = ?");
$self->{delete_releases} =
- $self->{dbh}->prepare("delete from ${prefix}releases " . "where release = ?");
+ $self->{dbh}->prepare("delete from ${prefix}releases " . "where rel = ?");
$self->{delete_files} =
$self->{dbh}->prepare("delete from ${prefix}files "
. "using ${prefix}files f, ${prefix}releases r "
. "where f.fileid = r.fileid "
- . "and r.release = ?");
+ . "and r.rel = ?");
return $self;
}
|
