From 796e6ae09301a7ea8aae74fdb3bb44538c0f5151 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 23 Sep 2015 06:06:13 -0400 Subject: [PATCH 1/3] 4.5.0 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dd1c8470c..1750bf616c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.5.0.0 (not yet released) +4.5.0.0 (2015-09-23) + rfe Pagination for GIS visualization + issue #6207 Usability improvements for console + issue #6310 Access to Add columns text-box and Go button when creating table diff --git a/README b/README index 6593ee1909..0876cb7a8e 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.0-rc1 +Version 4.5.0 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 246fd922ce..2e591960dd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.0-rc1' +version = '4.5.0' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f4eb8800ae..b67ae24237 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.0-rc1'); + $this->set('PMA_VERSION', '4.5.0'); /** * @deprecated */ From b5c731ab62e4f85b5f6beeca064796b0c946ed20 Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Thu, 24 Sep 2015 00:22:58 +0530 Subject: [PATCH 2/3] Backport 053edda33f5bd957726b8bc82167ec8d30e705bc Signed-off-by: Marc Delisle --- ChangeLog | 3 +++ libraries/plugins/export/ExportSql.class.php | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1750bf616c..40b8ba6fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ phpMyAdmin - ChangeLog ====================== +4.5.0.1 (2015-09-24) +- issue #11492 AUTO_INCREMENT statements are partly missing from exports + 4.5.0.0 (2015-09-23) + rfe Pagination for GIS visualization + issue #6207 Usability improvements for console diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 0993486e63..62e89b4e33 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1709,13 +1709,12 @@ class ExportSql extends ExportPlugin } // Generating auto-increment-related query. - if ((! empty($auto_increment)) - && ($update_indexes_increments) - && ($statement->entityOptions->has('AUTO_INCREMENT') !== false) - ) { + if ((! empty($auto_increment)) && ($update_indexes_increments)) { $sql_auto_increments_query = $alter_header . $crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment); - if (isset($GLOBALS['sql_auto_increment'])) { + if (isset($GLOBALS['sql_auto_increment']) + && ($statement->entityOptions->has('AUTO_INCREMENT') !== false) + ) { $sql_auto_increments_query .= ', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT'); } From 9e08133f49f0b99868fec434762366d08a45b6f8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 24 Sep 2015 04:14:57 -0400 Subject: [PATCH 3/3] 4.5.0.1 release Signed-off-by: Marc Delisle --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 0876cb7a8e..cbbc7b842c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.0 +Version 4.5.0.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 2e591960dd..c1ea9bd112 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.0' +version = '4.5.0.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b67ae24237..6d5d3eb41c 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.0'); + $this->set('PMA_VERSION', '4.5.0.1'); /** * @deprecated */