Adjust mysql SET NAMES in remaining places as we agreed this was the go

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 4ebc195d96065155f4fe52907080633d6078d97f..fab07d65596d92bf44630028bcc01269b0aee727 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -7,7 +7,7 @@
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES utf8mb4 */;
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

diff --git a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
index 1dd4d8970c9dbe6df8260438fd7667ede2869aa6..7e806cafeecdfc582c048ebc953922d0d28f9cf8 100644 (file)
--- a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
+++ b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
@@ -13,7 +13,7 @@ SET FOREIGN_KEY_CHECKS=0;
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES utf8mb4 */;
 
 --
 -- Database: `civicrm_tests_dev`

diff --git a/xml/templates/civicrm_country.tpl b/xml/templates/civicrm_country.tpl
index 49c4882e3585dfe221af001c20c3b3cd4a3e3de7..93dd53524984b5bb9fbcfc155dbcd1a5a4a7efa7 100644 (file)
--- a/xml/templates/civicrm_country.tpl
+++ b/xml/templates/civicrm_country.tpl
@@ -9,7 +9,7 @@
 -- Generated from {$smarty.template}
 -- {$generated}
 --
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES utf8mb4 */;
 
 /*******************************************************
 *

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index a51b0e0be809f3ec5be0cca43e120d312d77d1c7..614c34c071c8da26a18ffcb5b31dd0d586de9378 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -9,7 +9,7 @@
 -- Generated from {$smarty.template}
 -- {$generated}
 --
-/*!40101 SET NAMES utf8 */;
+/*!40101 SET NAMES utf8mb4 */;
 
 INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (1000, 1228, "AL", "Alabama"),