From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 11 Apr 2013 17:12:53 +0000 (-0700)
Subject: Use numeric time zone in export (thanks to Martin Dzubak)
X-Git-Tag: v3.6.4~20
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=433357f8247c1fa8ef6dcfbf0cd463d1bed88ee8;p=adminer.git

Use numeric time zone in export (thanks to Martin Dzubak)
---

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 57fe60bc..ee3f3d0d 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -14,7 +14,7 @@ if ($_POST) {
 
 " . ($jush != "sql" ? "" : "SET NAMES utf8;
 " . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
-SET time_zone = " . q($connection->result("SELECT @@time_zone")) . ";
+SET time_zone = " . q(substr(preg_replace('~^[^-]~', '+\0', $connection->result("SELECT TIMEDIFF(NOW(), UTC_TIMESTAMP)")), 0, 6)) . ";
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
 ");
diff --git a/changes.txt b/changes.txt
index 669437cc..ebac5673 100644
--- a/changes.txt
+++ b/changes.txt
@@ -11,6 +11,7 @@ Open database to a new window after selecting it with Ctrl
 Disable autocapitalize in identifiers on mobile browsers
 MySQL: Compatibility with MySQL 5.6
 MySQL: Move ALTER export to plugin
+MySQL: Use numeric time zone in export
 SQLite: Export indexes
 
 Adminer 3.6.3 (released 2013-01-23):