The branch, master has been updated via 195a084f38bd051ab8de3d19f7fa07d62d810263 (commit) via 23ea1c404217fa96e7c6127e8b81d405469f19bd (commit) via bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 (commit) via 0a681c84a551b2cdd3283b2a608375bfc0143b64 (commit) via a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 (commit) via 2fada4e4a3dd405e0549bbe5ce20e2a46ced453f (commit) via 9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit) via d000a74d09a2f1cd6645df64b1bfa0c55257f9f5 (commit) via f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit) via 0b7a3f716ad59c1b6db88cc721b6d158cf4833a6 (commit) via d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit) via 1f5a19b69cc303728417c13dbb23f7fd9fc89a97 (commit) via bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit) via 063058741bc37974e06b7d7db6fc74ce620bf649 (commit) via b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit) via c896fb50ad9ac9dc73bd83a99b01f3a440c753f1 (commit) via f900210a0f05511658a8d64d8876b935ab7a5972 (commit) via 0645a4f1190588403093d7824bfbe28f39972a29 (commit) via 66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit) via 92f1160b2a23f14a966fab1ef2ff2620f363a570 (commit) via 548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit) via ee70c958d8df15848cf2f3ef6ed1fe7c75cc28bc (commit) via cbe8f389821d2fb0a107478e73b654309566380d (commit) via b2673cf501e1c25bb185f002b687f70951fceda9 (commit) via 326deca827d87eb148afb96fa6ec7ce29644cb93 (commit) via fd4ded141021d2d496c7095f375aefb10b590c16 (commit) via a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit) via 3287ca0e4b40b5c501c1aeab6c0eb90eaa7c3674 (commit) via b1c1640dc92238b0fafb3c0c2f9c4350a05571d0 (commit) via 5fd02248cd4f410d963daf55150c33e8d4e01850 (commit) via fd739840cdb07739c8b971363291c9d0534764ec (commit) via a91fa294db2116ade8f0995b251e9b44b70bc13f (commit) via 624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit) via f2f0e9bb47fb2b238f7c53dff83b72fb3b1a1866 (commit) via 644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit) via 91dee4238c0e584afa470287b2c69127d54f8998 (commit) via e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit) via eacec1d091c07a785b63a092e9d5c294f574c107 (commit) via 0a6badd2d60b6cc216f714ea777905566de14e60 (commit) via 1ad5d85666f1c10c7c3da5900fb5fbdcd690499c (commit) via f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit) via 6d9b602b8741a253fcfcf7e4c8e14fbe23f35f85 (commit) via aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit) via a04da7df128258ce493ff4e6b8f91bece9d48886 (commit) via c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit) via a3d022b7caaeecfe6baf28216302ebadac06190d (commit) via fe5e8999b42b98873a032a937cb873f2d47a1826 (commit) via 2e60e8710e129e6f8942a726f52a2ffdea9d4c25 (commit) via 182ca44769a3940616e42de5b90ad97693dec362 (commit) via cf3f73f5d0f549c7833da0483a168effe627ca16 (commit) via 8adc82666bca869bdf73f2b92d40df532fe10f57 (commit) via bf7b74e941bc012c85e4523b219a1027cbf01de2 (commit) via e16be872b64cab229784a0700a329871454f8baf (commit) via afb6f77d8d2ec4d7ba92ca8279b736e4f5bf7729 (commit) via 4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit) via d0e2fc83f37283eb33c9ad422e938d709a84d98b (commit) via 079cb404c776821bc9b161bd297b956a6e6418a4 (commit) via 891c5780feafe82e1f363f45a23c1067943ce47a (commit) via 6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit) via 01a70cca07878bb83112352b43e3a6bc67a5e224 (commit) via cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit) via 902e07df774c602e2f63838ae1c57adb88092ddd (commit) via 867782d82ffe888feb40091aa417818e115090b8 (commit) via 6045e72cd355133eb49da59150846c4acbc8103e (commit) via 994381d3c827271b61ccd203f5c953b434a6b772 (commit) via e596726312e3fbd3638e23a536933f22135320d7 (commit) via b10d8c63abb010c9917f3a20b192b22da62bf478 (commit) via 34e8c15a64c656d2f6c40fcc2ba9f8e2f0d8e635 (commit) via db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit) via d2880858cb57e4d0289188c60552f726f17b0435 (commit) via 34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit) via 2e4ce6afa754bb9ff65b624e9f407451da1cdcdf (commit) via f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit) via 512975e91cfbb603952690ac2e1926d031174b6c (commit) via 1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit) via 294d699e8475cb3ab171441d429e7715beaf3c67 (commit) via 78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit) via c67ceaa83b6107a6e0d8e4e1ef1ff26e37e08f1d (commit) via c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit) via 4e4e40188f7d6a0a49e9471da97942c9fbc17797 (commit) via 93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit) via 73275fc4deff9ea416589d9a0928e0e90d4607dc (commit) via a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit) via 526dce65cb41e64c40df2939d5a5bc3db7a683d1 (commit) via f3833884e430cf9104114f391e71925c5f6bd5fa (commit) from 1283f4a5f62af79338cf74ec4f4171d8684a1ddd (commit)

- Log ----------------------------------------------------------------- commit 195a084f38bd051ab8de3d19f7fa07d62d810263 Merge: 23ea1c404217fa96e7c6127e8b81d405469f19bd 1283f4a5f62af79338cf74ec4f4171d8684a1ddd Author: Michal Čihař mcihar@novell.com Date: Mon Mar 1 13:27:43 2010 +0100

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 23ea1c404217fa96e7c6127e8b81d405469f19bd Merge: 0a681c84a551b2cdd3283b2a608375bfc0143b64 bf4a7ee2bcfa9f68b10ed50c62009d3dcbdc7b40 Author: Michal Čihař mcihar@novell.com Date: Mon Mar 1 13:23:44 2010 +0100

Merge branch 'QA_3_3'

commit 0a681c84a551b2cdd3283b2a608375bfc0143b64 Merge: 4cff76ec9b240625db52b6747d6f841335ae6b75 a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 Author: Michal Čihař mcihar@novell.com Date: Mon Mar 1 13:20:19 2010 +0100

Merge remote branch 'origin/QA_3_3'

Conflicts: ChangeLog Documentation.html README lang/afrikaans-utf-8.inc.php lang/albanian-utf-8.inc.php lang/arabic-utf-8.inc.php lang/azerbaijani-utf-8.inc.php lang/bangla-utf-8.inc.php lang/basque-utf-8.inc.php lang/belarusian_cyrillic-utf-8.inc.php lang/belarusian_latin-utf-8.inc.php lang/bosnian-utf-8.inc.php lang/brazilian_portuguese-utf-8.inc.php lang/bulgarian-utf-8.inc.php lang/catalan-utf-8.inc.php lang/chinese_simplified-utf-8.inc.php lang/chinese_traditional-utf-8.inc.php lang/croatian-utf-8.inc.php lang/czech-utf-8.inc.php lang/danish-utf-8.inc.php lang/dutch-utf-8.inc.php lang/estonian-utf-8.inc.php lang/finnish-utf-8.inc.php lang/french-utf-8.inc.php lang/galician-utf-8.inc.php lang/georgian-utf-8.inc.php lang/german-utf-8.inc.php lang/greek-utf-8.inc.php lang/hebrew-utf-8.inc.php lang/hindi-utf-8.inc.php lang/hungarian-utf-8.inc.php lang/indonesian-utf-8.inc.php lang/italian-utf-8.inc.php lang/japanese-utf-8.inc.php lang/korean-utf-8.inc.php lang/latvian-utf-8.inc.php lang/lithuanian-utf-8.inc.php lang/macedonian_cyrillic-utf-8.inc.php lang/malay-utf-8.inc.php lang/mongolian-utf-8.inc.php lang/norwegian-utf-8.inc.php lang/persian-utf-8.inc.php lang/polish-utf-8.inc.php lang/portuguese-utf-8.inc.php lang/romanian-utf-8.inc.php lang/russian-utf-8.inc.php lang/serbian_cyrillic-utf-8.inc.php lang/serbian_latin-utf-8.inc.php lang/sinhala-utf-8.inc.php lang/slovak-utf-8.inc.php lang/slovenian-utf-8.inc.php lang/spanish-utf-8.inc.php lang/swedish-utf-8.inc.php lang/tatarish-utf-8.inc.php lang/thai-utf-8.inc.php lang/turkish-utf-8.inc.php lang/ukrainian-utf-8.inc.php lang/uzbek_cyrillic-utf-8.inc.php lang/uzbek_latin-utf-8.inc.php libraries/Config.class.php libraries/display_tbl.lib.php server_privileges.php server_replication.php translators.html

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 5 +++-- lang/dutch-utf-8.inc.php | 1 + lang/english-utf-8.inc.php | 1 + lang/french-utf-8.inc.php | 4 ++-- server_privileges.php | 4 ++-- tbl_select.php | 1 + 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 2b441d9..52a8c1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,7 +43,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA

3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly -- Foo +- bug #2948492 [interface] Slide effect masks some fields on search page +- Test

3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, @@ -123,7 +124,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -- [privileges] Improve escaping of hostname +- [privileges] Improve Proper escaping of hostname

3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 3e1d079..f3d9e0e 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strShowInsert = 'Toon insert query'; $strPDFPageCreated = 'Pagina is aangemaakt'; $strPDFPageCreateFailed = 'Het aanmaken van de pagina is mislukt'; $strPmadbReLoginToEnable = 'Log opnieuw in om de gewijzigde instellingen te gebruiken.'; + ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 69684b7..c557ab7 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"';

+ ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index e280837..88dd503 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1611,8 +1611,6 @@ $strXML = 'XML'; $strYes = 'Oui';

$strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; -$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to translate -$strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate $strZip = '"zippé"';

$strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate @@ -1628,4 +1626,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (<code>c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to translate +$strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate ?> diff --git a/server_privileges.php b/server_privileges.php index a41fde8..28c2a3e 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1780,7 +1780,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs if (in_array($table_search_in, $tables)) { $db_rights_sqls[] = ' SELECT DISTINCT `Table_name` - FROM `mysql`.' . PMA_backquote($table_search_in) + FROM `mysql`.' . PMA_backquote($table_search_in) . $user_host_condition; } } @@ -1891,7 +1891,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $current_db = PMA_escape_mysql_wildcards($current_db); // cannot use array_diff() once, outside of the loop, // because the list of databases has special characters - // already escaped in $found_rows, + // already escaped in $found_rows, // contrary to the output of SHOW DATABASES if (empty($found_rows) || ! in_array($current_db, $found_rows)) { echo ' <option value="' . htmlspecialchars($current_db) . '">' diff --git a/tbl_select.php b/tbl_select.php index 06433ca..78b749d 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -308,6 +308,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { unset($choices); ?> </fieldset> +<br style="clear: both;"/> </div> </fieldset> <fieldset class="tblFooters">

hooks/post-receive