Call it "toinnodb"

diff --git a/include/dbstructure.php b/include/dbstructure.php
index e5d29fa085f3acc9c61623bd4c4e633ba9c59ba9..fe44cc7649c7c6261b930ea3d1acb47f41043262 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1751,7 +1751,7 @@ function dbstructure_run(&$argv, &$argc) {
                        case "dumpsql":
                                print_structure(db_definition());
                                return;
-                       case "innodb":
+                       case "toinnodb":
                                convert_to_innodb();
                                return;
                }
@@ -1765,7 +1765,7 @@ function dbstructure_run(&$argv, &$argc) {
        echo "dryrun            show database update schema queries without running them\n";
        echo "update            update database schema\n";
        echo "dumpsql           dump database schema\n";
-       echo "innodb            convert all tables from MyISAM to InnoDB\n";
+       echo "toinnodb          convert all tables from MyISAM to InnoDB\n";
        return;
 
 }

diff --git a/mod/admin.php b/mod/admin.php
index c86c0db91e9671dca156c75db2973ca711494f36..6be08f45a7c9f3bfb210850db25e0334ef6c9348 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -447,7 +447,7 @@ function admin_page_summary(App $a) {
        $warningtext = array();
        if (dbm::is_result($r)) {
                $showwarning = true;
-               $warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php innodb</tt> of your Friendica installation for an automatic conversion.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
+               $warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
        }
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
        if ((version_compare($db->server_info(), '5.7.4') >= 0) AND