From 14941285b9069188191d11885022e73029cc7042 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 3 Apr 2015 07:27:13 -0400 Subject: [PATCH 1/2] 4.4.2-dev Signed-off-by: Marc Delisle --- ChangeLog | 3 +++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62c146ba77..17590f6d9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ phpMyAdmin - ChangeLog ====================== +4.4.2.0 (not yet released) + + 4.4.1.0 (not yet released) - bug #4813 MySQL 5.7.6 and the Users menu tab - bug #4818 MySQL 5.7.6 and changing the password for another user diff --git a/README b/README index 9d60e56951..1c0135ee69 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.1-dev +Version 4.4.2-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a245b342c9..bf2c1807bd 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.4.1-dev' +version = '4.4.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 213d034fb8..25ffaae142 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.1-dev'); + $this->set('PMA_VERSION', '4.4.2-dev'); /** * @deprecated */ From ed6976a83eb61234902b0e97d800df2870245cd3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 3 Apr 2015 07:29:22 -0400 Subject: [PATCH 2/2] This fix goes to 4.4.2 Signed-off-by: Marc Delisle --- ChangeLog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15944416c2..c095ff8735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.4.2.0 (not yet released) - +- bug #4835 PMA_hideShowConnection not called after submit_num_fields 4.4.1.0 (not yet released) - bug #4813 MySQL 5.7.6 and the Users menu tab @@ -22,7 +22,6 @@ phpMyAdmin - ChangeLog - bug #4822 Compress when php.ini output_buffering is active - bug #4832 Sorting distinct values result loses links - bug #4834 Do not attach token to css requests to improve caching -- bug #4835 PMA_hideShowConnection not called after submit_num_fields 4.4.0.0 (2015-04-01) + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time