svnno****@sourc*****
svnno****@sourc*****
2008年 2月 14日 (木) 21:57:36 JST
SRADRevision: 505
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=505
Author: tach
Date: 2008-02-14 21:57:35 +0900 (Thu, 14 Feb 2008)
Log Message:
-----------
* Backported from 2.5.0.194 at plugins/Stats/Stats.pm
to fix table accesslog_temp_uidip create error
Modified Paths:
--------------
slashjp/trunk/debian/changelog
slashjp/trunk/plugins/Stats/Stats.pm
-------------- next part --------------
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2008-02-08 10:14:55 UTC (rev 504)
+++ slashjp/trunk/debian/changelog 2008-02-14 12:57:35 UTC (rev 505)
@@ -1,3 +1,10 @@
+slash (2.5.0.192-4) unstable; urgency=low
+
+ * Backported from 2.5.0.194 at plugins/Stats/Stats.pm
+ to fix table accesslog_temp_uidip create error
+
+ -- Taku YASUI <tach****@osdn*****> Thu, 14 Feb 2008 21:56:15 +0900
+
slash (2.5.0.192-3) unstable; urgency=low
* Revert to old (before 2.5.0.190) format of index.pl comment links
Modified: slashjp/trunk/plugins/Stats/Stats.pm
===================================================================
--- slashjp/trunk/plugins/Stats/Stats.pm 2008-02-08 10:14:55 UTC (rev 504)
+++ slashjp/trunk/plugins/Stats/Stats.pm 2008-02-14 12:57:35 UTC (rev 505)
@@ -96,7 +96,7 @@
$self->sqlDo("DROP TABLE IF EXISTS accesslog_temp_host_addr");
$self->sqlDo("DROP TABLE IF EXISTS accesslog_build_unique_uid");
$self->sqlDo("CREATE TABLE accesslog_temp_host_addr (host_addr char(32) NOT NULL, anon ENUM('no','yes') NOT NULL DEFAULT 'yes', PRIMARY KEY (host_addr, anon)) TYPE = InnoDB");
- $self->sqlDo("CREATE TABLE accesslog_temp_uidip (uidip varchar(32) NOT NULL, op varchar(254) NOT NULL, PRIMARY KEY (uidip, op)) TYPE = InnoDB");
+ $self->sqlDo("CREATE TABLE accesslog_build_uidip (uidip varchar(32) NOT NULL, op varchar(254) NOT NULL, PRIMARY KEY (uidip, op), INDEX (op)) TYPE = InnoDB");
$self->sqlDo("CREATE TABLE accesslog_build_unique_uid ( uid MEDIUMINT UNSIGNED NOT NULL, PRIMARY KEY (uid)) TYPE = InnoDB");
# Then, get the schema in its CREATE TABLE statement format.
@@ -228,7 +228,7 @@
);
return undef unless $self->_do_insert_select(
- "accesslog_temp_uidip",
+ "accesslog_build_uidip",
"IF(uid = $constants->{anonymous_coward_uid}, uid, host_addr), op",
"accesslog_temp",
"",
@@ -237,7 +237,7 @@
);
return undef unless $self->_do_insert_select(
- "accesslog_temp_uidip",
+ "accecsslog_build_uidip",
"IF(uid = $constants->{anonymous_coward_uid}, uid, host_addr), op",
"accesslog_temp_rss",
"",
@@ -1122,7 +1122,7 @@
my $tn = 0;
for my $hit (@$hit_ar) {
++$tn;
- push @tables, "accesslog_temp_uidip AS a$tn";
+ push @tables, "accecsslog_build_uidip AS a$tn";
push @where, "a$tn.uidip = a1.uidip" if $tn > 1;
push @where, "a$tn.op=" . $self->sqlQuote($hit);
}
@@ -1130,7 +1130,7 @@
my $tnprev = $tn;
++$tn;
my $notlist = join ',', map { $self->sqlQuote($_) } @$nohit_ar;
- $tables[-1] .= " LEFT JOIN accesslog_temp_uidip AS a$tn
+ $tables[-1] .= " LEFT JOIN accecsslog_build_uidip AS a$tn
ON (a$tn.uidip=a$tnprev.uidip AND a$tn.op IN ($notlist))";
push @where, "a$tn.op IS NULL";
}