fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-04-23 06:34 pm

[dw-free] update cgi-bin/LJ/ConfCheck/General.pm

[commit: http://hg.dwscoalition.org/dw-free/rev/6e9c6ba64322]

http://bugs.dwscoalition.org/show_bug.cgi?id=2229

Create tables as InnoDB by default.

Patch by [personal profile] kareila.

Files modified:
  • bin/upgrading/update-db.pl
  • cgi-bin/LJ/ConfCheck/General.pm
  • doc/raw/lj.book/install/mysql_setup.xml
--------------------------------------------------------------------------------
diff -r 0d9755820438 -r 6e9c6ba64322 bin/upgrading/update-db.pl
--- a/bin/upgrading/update-db.pl	Fri Apr 23 01:34:39 2010 +0000
+++ b/bin/upgrading/update-db.pl	Fri Apr 23 11:39:44 2010 -0700
@@ -55,7 +55,7 @@ GetOptions("runsql" => \$opt_sql,
            );
 
 $opt_nostyles = 1 unless LJ::is_enabled("update_styles");
-$opt_innodb = 1 if $LJ::USE_INNODB;
+$opt_innodb = 1;
 
 if ($opt_help) {
     die "Usage: update-db.pl
diff -r 0d9755820438 -r 6e9c6ba64322 cgi-bin/LJ/ConfCheck/General.pm
--- a/cgi-bin/LJ/ConfCheck/General.pm	Fri Apr 23 01:34:39 2010 +0000
+++ b/cgi-bin/LJ/ConfCheck/General.pm	Fri Apr 23 11:39:44 2010 -0700
@@ -815,7 +815,6 @@ my %bools = (
              "OPENID_STATELESS" => "Speak stateless OpenID.  Slower, but no local state needs to be kept.",
              "ONLY_USER_VHOSTS" => "Don't allow www.* journals at /users/ and /~ and /community/.  Only allow them on their own user virtual host domains.",
              "USERPIC_MOGILEFS" => "Store userpics on MogileFS.",
-             "USE_INNODB" => "Create new tables as InnoDB.",
              "CONCAT_RES" => "Instruct Perlbal to concatenate static files on non-SSL pages",
              "CONCAT_RES_SSL" => "Instruct Perlbal to concatenate static files on SSL pages",
              );
diff -r 0d9755820438 -r 6e9c6ba64322 doc/raw/lj.book/install/mysql_setup.xml
--- a/doc/raw/lj.book/install/mysql_setup.xml	Fri Apr 23 01:34:39 2010 +0000
+++ b/doc/raw/lj.book/install/mysql_setup.xml	Fri Apr 23 11:39:44 2010 -0700
@@ -87,7 +87,7 @@ the script as follows:
 
    <calloutlist>
       <callout arearefs="COinnodbTables" id="TablesinnodbCO">
-            <para>You can enable <link linkend="ljconfig.use_innodb"><literal role="variable">$LJ::USE_INNODB</literal></link>, to have tables created
+            <para>All tables are created
             as <ulink url="http://dev.mysql.com/doc/mysql/en/InnoDB_overview.html"><literal>InnoDB</literal></ulink> by default.</para>
       </callout>
       <callout arearefs="COtexttoolLocal" id="texttoolLocalCO">
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org