Skip to content

Commit 42c0eba

Browse files
TithuguesTithugues
committed
Merge branch 'master' into useNamespaces_master
2 parents 38ec9e7 + 6a163ea commit 42c0eba

178 files changed

Lines changed: 13403 additions & 19141 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ChangeLog‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ phpMyAdmin - ChangeLog
44
4.6.0.0 (not yet released)
55
+ issue #11456 Disabled storage engines
66

7+
4.5.1.0 (not yet released)
8+
79
4.5.0.0 (not yet released)
810
+ rfe Pagination for GIS visualization
911
+ issue #6207 Usability improvements for console
@@ -113,6 +115,11 @@ phpMyAdmin - ChangeLog
113115
- issue #11451 Designer-Bug in move.js on multiple server configuration
114116
- issue #11458 Invalid UTF-8 sequence in argument
115117
- issue #11457 Request URI too large
118+
- issue Invalid argument supplied for foreach()
119+
- issue #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
120+
121+
4.4.14.1 (2015-09-08)
122+
- issue [security] reCaptcha bypass
116123

117124
4.4.14.0 (2015-08-20)
118125
- issue #11367 Export after search, missing WHERE clause

‎README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ phpMyAdmin - Readme
33

44
Version 4.6.0-dev
55

6-
A set of PHP-scripts to manage MySQL over the web.
6+
A web interface for MySQL and MariaDB.
77

88
https://www.phpmyadmin.net/
99

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
phpMyAdmin
22
==========
33

4-
A set of PHP-scripts to manage MySQL over the web.
4+
A web interface for MySQL and MariaDB.
55

66
https://www.phpmyadmin.net/
77

‎db_create.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
require_once 'libraries/common.inc.php';
1313

1414
require_once 'libraries/mysql_charsets.inc.php';
15-
if (! PMA_DRIZZLE) {
16-
include_once 'libraries/replication.inc.php';
17-
}
15+
16+
require_once 'libraries/replication.inc.php';
17+
1818
require 'libraries/build_html_for_db.lib.php';
1919

2020
/**

‎db_operations.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
}
108108
unset($sqlConstratints);
109109

110-
if (! PMA_DRIZZLE && PMA_MYSQL_INT_VERSION >= 50100) {
110+
if (PMA_MYSQL_INT_VERSION >= 50100) {
111111
// here DELIMITER is not used because it's not part of the
112112
// language; each statement is sent one by one
113113

@@ -263,7 +263,7 @@
263263
// Don't allow to easily drop mysql database, RFE #1327514.
264264
if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase'])
265265
&& ! $db_is_system_schema
266-
&& (PMA_DRIZZLE || $GLOBALS['db'] != 'mysql')
266+
&& $GLOBALS['db'] != 'mysql'
267267
) {
268268
$response->addHTML(PMA_getHtmlForDropDatabaseLink($GLOBALS['db']));
269269
}

‎doc/config.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,8 +2112,7 @@ Languages
21122112
Defines the default connection collation to use, if not user-defined.
21132113
See the `MySQL documentation for charsets
21142114
<http://dev.mysql.com/doc/mysql/en/charset-charsets.html>`_
2115-
for list of possible values. This setting is
2116-
ignored when connected to Drizzle server.
2115+
for list of possible values.
21172116

21182117
.. config:option:: $cfg['Lang']
21192118

‎doc/faq.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ For older MySQL versions, our `Downloads <https://www.phpmyadmin.net/downloads/>
195195

196196
For `MariaDB <http://mariadb.org/>`_, versions 5.5 and newer are supported.
197197

198-
For `Drizzle <http://www.drizzle.org>`_, versions 7.1 and newer are supported.
199-
200198
.. _faq1_17a:
201199

202200
1.17a I cannot connect to the MySQL server. It always returns the error message, "Client does not support authentication protocol requested by server; consider upgrading MySQL client"

‎doc/require.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ phpMyAdmin supports MySQL-compatible databases.
4242

4343
* MySQL 5.5 or newer
4444
* MariaDB 5.5 or newer
45-
* Drizzle
4645

4746
.. seealso:: :ref:`faq1_17`
4847

‎doc/setup.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,8 @@ are always ways to make your installation more secure:
632632
phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
633633
* Consider hiding phpMyAdmin behind an authentication proxy, so that
634634
users need to authenticate prior to providing MySQL credentials
635-
to phpMyAdmin. You can achieve this by confiuring your web server to request
636-
HTTP authentication. For exaple in Apache this can be done by:
635+
to phpMyAdmin. You can achieve this by configuring your web server to request
636+
HTTP authentication. For example in Apache this can be done with:
637637

638638
.. code-block:: apache
639639
@@ -643,7 +643,7 @@ are always ways to make your installation more secure:
643643
Require valid-user
644644
645645
Once you have changed configuration, you need to create list of users which
646-
can authenticate. This can be done using :program:`htpasswd` utility:
646+
can authenticate. This can be done using the :program:`htpasswd` utility:
647647

648648
.. code-block:: sh
649649

‎import.php‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -586,22 +586,10 @@
586586
$charset_conversion = true;
587587
}
588588
} elseif (isset($charset_of_file) && $charset_of_file != 'utf-8') {
589-
if (PMA_DRIZZLE) {
590-
// Drizzle doesn't support other character sets,
591-
// so we can't fallback to SET NAMES - throw an error
592-
$message = PMA\libraries\Message::error(
593-
__(
594-
'Cannot convert file\'s character'
595-
. ' set without character set conversion library!'
596-
)
597-
);
598-
PMA_stopImport($message);
599-
} else {
600-
$GLOBALS['dbi']->query('SET NAMES \'' . $charset_of_file . '\'');
601-
// We can not show query in this case, it is in different charset
602-
$sql_query_disabled = true;
603-
$reset_charset = true;
604-
}
589+
$GLOBALS['dbi']->query('SET NAMES \'' . $charset_of_file . '\'');
590+
// We can not show query in this case, it is in different charset
591+
$sql_query_disabled = true;
592+
$reset_charset = true;
605593
}
606594

607595
// Something to skip? (because timeout has passed)

0 commit comments

Comments
 (0)