Index: branches/5.2.x/core/install/steps_db.xml =================================================================== diff -u -r16792 -r16819 --- branches/5.2.x/core/install/steps_db.xml (.../steps_db.xml) (revision 16792) +++ branches/5.2.x/core/install/steps_db.xml (.../steps_db.xml) (revision 16819) @@ -8,7 +8,7 @@
Database Name - name of the database where In-Portal will be installed.
Database User Name - name of the user for selected database.
Database User Password - password for selected username.
-Database Collation - character set used to store data in text fields (normally "utf8_general_ci").
+Database Collation - character set used to store data in text fields (normally "utf8_general_ci" for MySQL 5.x and "utf8mb3_general_ci" for MySQL 8.x+).
Prefix for Table Names - specified when multiple scripts will be run in the same database. Prefix can be any text string allowed in table naming by your database engine (normally "inp_").
Use existing In-Portal installation setup in this Database - select "Yes" Index: branches/5.2.x/core/install.php =================================================================== diff -u -r16813 -r16819 --- branches/5.2.x/core/install.php (.../install.php) (revision 16813) +++ branches/5.2.x/core/install.php (.../install.php) (revision 16819) @@ -1,6 +1,6 @@ CheckDatabase(($this->currentStep == 'db_config') && !$this->GetVar('UseExistingSetup')); + + if ( $status ) { + $db_collation = $this->toolkit->systemConfig->get('DBCollation', 'Database'); + $sql = 'SHOW COLLATION LIKE ' . $this->Conn->qstr($db_collation); + $db_collation_data = $this->Conn->Query($sql); + + if ( !is_array($db_collation_data) || !$db_collation_data ) { + $status = false; + $this->errorMessage = 'Chosen database collation isn\'t compatible with used MySQL Server version'; + } + } break; case 'select_license': Index: branches/5.2.x/core/install/step_templates/db_reconfig.tpl =================================================================== diff -u -r16435 -r16819 --- branches/5.2.x/core/install/step_templates/db_reconfig.tpl (.../db_reconfig.tpl) (revision 16435) +++ branches/5.2.x/core/install/step_templates/db_reconfig.tpl (.../db_reconfig.tpl) (revision 16819) @@ -48,11 +48,15 @@