Revert "MDEV-29347: sql-mode=ONLY_FULL_GROUP_BY work around for tzinfo"

This reverts commit fab7f4020790b233c03cb0ab0b0c9fd5483d66c5 as
upstream bug MDEV-29347 is fixed.

10.10/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.11/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.3/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.4/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.5/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.6/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.7/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.8/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

10.9/docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password

docker-entrypoint.sh

@@ -273,11 +273,8 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		{
+		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			| docker_process_sql --dont-use-mysql-root-password --database=mysql
-			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
-			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
-		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password