Resolving conflicts after merge in develop the features related to Laravel 5.7 and MySQL 5.7 (Part 2)
This commit is contained in:
@@ -2084,8 +2084,8 @@ class WorkspaceTools
|
||||
CLI::logging("* End deleting indexes from big tables: " . implode(', ', self::$bigTables) . "... (Completed on " .
|
||||
(microtime(true) - $start) . " seconds)\n");
|
||||
|
||||
$start = microtime(true);
|
||||
CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
|
||||
$start = microtime(true);
|
||||
$workspace->migrateContent($lang);
|
||||
CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
|
||||
(microtime(true) - $start) . " seconds)\n");
|
||||
@@ -2154,7 +2154,6 @@ class WorkspaceTools
|
||||
$start = microtime(true);
|
||||
$workspace->migrateList(true, $lang);
|
||||
CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
|
||||
/*----------------------------------********---------------------------------*/
|
||||
|
||||
CLI::logging("* Start updating MySQL triggers...\n");
|
||||
$start = microtime(true);
|
||||
|
||||
Reference in New Issue
Block a user