Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-12-22 20:35:12 +01:00
commit c345dee399
2 changed files with 6 additions and 0 deletions

View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- bug #4170 Overflow scroll for table grid is not a good solution
- bug #2961 Relations settings not updated on config change
- bug #4187 SQL query inline edit doesn't post changes on the first run
+ rfe #1465 Docs for connections to IPv6 only MySQL instances
4.1.1.0 (2013-12-17)
- bug #4154 Error using UNION query

View File

@ -196,6 +196,11 @@ Server connection settings
* dot - ``'.'``, i.e., use named pipes on windows systems
* empty - ``''``, disables this server
.. note::
phpMyAdmin supports connecting to MySQL servers reachable via IPv6 only.
To connect to an IPv6 MySQL server, enter its IPv6 address in this field.
.. config:option:: $cfg['Servers'][$i]['port']
:type: string