Revert "timezone initialization - work around MDEV-25556"

This reverts commit 05b608e.
tymonx · May 21, 2021 · 6f5d272 · 6f5d272
1 parent 3a602b5
commit 6f5d272
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/10.2/docker-entrypoint.sh b/10.2/docker-entrypoint.sh
@@ -254,11 +254,9 @@ docker_setup_db() {
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
 			done
 
-			# sed on "Local time zone" is for https://bugs.mysql.com/bug.php?id=20545
-			# Offset quoting is because of MDEV-25556 (10.6)
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
 			mysql_tzinfo_to_sql /usr/share/zoneinfo \
-				| sed -e 's/Local time zone must be set--see zic manual page/FCTY/' \
-				      -e 's/Offset/`Offset`/'
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
 
 			for table in "${tztables[@]}"; do
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"

diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh
@@ -254,11 +254,9 @@ docker_setup_db() {
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
 			done
 
-			# sed on "Local time zone" is for https://bugs.mysql.com/bug.php?id=20545
-			# Offset quoting is because of MDEV-25556 (10.6)
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
 			mysql_tzinfo_to_sql /usr/share/zoneinfo \
-				| sed -e 's/Local time zone must be set--see zic manual page/FCTY/' \
-				      -e 's/Offset/`Offset`/'
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
 
 			for table in "${tztables[@]}"; do
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"

diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh
@@ -254,11 +254,9 @@ docker_setup_db() {
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
 			done
 
-			# sed on "Local time zone" is for https://bugs.mysql.com/bug.php?id=20545
-			# Offset quoting is because of MDEV-25556 (10.6)
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
 			mysql_tzinfo_to_sql /usr/share/zoneinfo \
-				| sed -e 's/Local time zone must be set--see zic manual page/FCTY/' \
-				      -e 's/Offset/`Offset`/'
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
 
 			for table in "${tztables[@]}"; do
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"

diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh
@@ -254,11 +254,9 @@ docker_setup_db() {
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
 			done
 
-			# sed on "Local time zone" is for https://bugs.mysql.com/bug.php?id=20545
-			# Offset quoting is because of MDEV-25556 (10.6)
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
 			mysql_tzinfo_to_sql /usr/share/zoneinfo \
-				| sed -e 's/Local time zone must be set--see zic manual page/FCTY/' \
-				      -e 's/Offset/`Offset`/'
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
 
 			for table in "${tztables[@]}"; do
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -254,11 +254,9 @@ docker_setup_db() {
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=0 */;"
 			done
 
-			# sed on "Local time zone" is for https://bugs.mysql.com/bug.php?id=20545
-			# Offset quoting is because of MDEV-25556 (10.6)
+			# sed is for https://bugs.mysql.com/bug.php?id=20545
 			mysql_tzinfo_to_sql /usr/share/zoneinfo \
-				| sed -e 's/Local time zone must be set--see zic manual page/FCTY/' \
-				      -e 's/Offset/`Offset`/'
+				| sed 's/Local time zone must be set--see zic manual page/FCTY/'
 
 			for table in "${tztables[@]}"; do
 				echo "/*!100400 ALTER TABLE $table TRANSACTIONAL=1 */;"