From d53ffc2158595686cb227f054e95eaeab4f08e0e Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 21 Feb 2014 09:09:09 -0800 Subject: [PATCH] MySQL: Respect daylight saving time in dump (bug #384) --- adminer/dump.inc.php | 5 ++++- changes.txt | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php index 6e429009..9a7b07b2 100644 --- a/adminer/dump.inc.php +++ b/adminer/dump.inc.php @@ -18,10 +18,13 @@ if ($_POST && !$error) { " . ($jush != "sql" ? "" : "SET NAMES utf8; " . ($_POST["data_style"] ? "SET foreign_key_checks = 0; -SET time_zone = " . q(substr(preg_replace('~^[^-]~', '+\0', $connection->result("SELECT TIMEDIFF(NOW(), UTC_TIMESTAMP)")), 0, 6)) . "; +SET time_zone = '+00:00'; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; " : "") . " "); + if ($jush == "sql" && $_POST["data_style"]) { + $connection->query("SET time_zone = '+00:00';"); + } } $style = $_POST["db_style"]; diff --git a/changes.txt b/changes.txt index bb87c263..e995e4ee 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,5 @@ Adminer 4.0.4-dev: +MySQL: Respect daylight saving time in dump, bug since Adminer 3.6.4 SQLite: Display auto-created unique indexes, bug since Adminer 3.5.0 Editor: Fix login() method, bug since Adminer 4.0.0