From c6f47d35bcd9f68956054138ab6ca495b22a42c8 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Fri, 11 Jun 2021 11:18:45 -0400 Subject: [PATCH] be re-runnable and don't force utf8mb4 --- CRM/Upgrade/Incremental/sql/5.39.alpha1.mysql.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/5.39.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.39.alpha1.mysql.tpl index 7e22d80264..e7ac1b36ae 100644 --- a/CRM/Upgrade/Incremental/sql/5.39.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.39.alpha1.mysql.tpl @@ -1,6 +1,6 @@ {* file to handle db changes in 5.39.alpha1 during upgrade *} -CREATE TABLE `civicrm_translation` ( +CREATE TABLE IF NOT EXISTS `civicrm_translation` ( `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique String ID', `entity_table` varchar(64) NOT NULL COMMENT 'Table where referenced item is stored', `entity_field` varchar(64) NOT NULL COMMENT 'Field where referenced item is stored', @@ -11,4 +11,4 @@ CREATE TABLE `civicrm_translation` ( PRIMARY KEY (`id`), INDEX `index_entity_lang`(entity_id, entity_table, language) ) -ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; +ENGINE=InnoDB ROW_FORMAT=DYNAMIC; -- 2.25.1