From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Apr 2017 21:55:16 +0000 (+0000)
Subject: Call it "toinnodb"
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2628ff91f4574870c84aeb6b6e356765e879fc4e;p=friendica.git

Call it "toinnodb"
---

diff --git a/include/dbstructure.php b/include/dbstructure.php
index e5d29fa085..fe44cc7649 100644
--- 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 c86c0db91e..6be08f45a7 100644
--- 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