- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-8-gbc5d816
by Michal Čihař 11 May '10

11 May '10

The branch, QA_3_3 has been updated via bc5d816449822928ce5fcb7d82ed216bfe0c3f45 (commit) from f4d5f23e2be8b5a8185cc7dd9a5b3febc06cc3b9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6649220..5ce0871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.4.0 (not yet released) - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan +- [browse] Fix handling of sort order if only column is specified. 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 05feefb..d6d93b0 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1882,7 +1882,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) // 1.4 Prepares display of first and last value of the sorted column if (! empty($sort_expression_nodirection)) { - list($sort_table, $sort_column) = explode('.', $sort_expression_nodirection); + if (strpos($sort_expression_nodirection, '.') === false) { + $sort_table = $table; + $sort_column = $sort_expression_nodirection; + } else { + list($sort_table, $sort_column) = explode('.', $sort_expression_nodirection); + } $sort_table = PMA_unQuote($sort_table); $sort_column = PMA_unQuote($sort_column); // find the sorted column index in row result hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-2987-gf81c051
by Michal Čihař 11 May '10

11 May '10

The branch, master has been updated via f81c051ea41121bf97f11113bd76d2bf19521cd7 (commit) via f4d5f23e2be8b5a8185cc7dd9a5b3febc06cc3b9 (commit) via fb9d4037cccb2fda09933d57baecea839ad32994 (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from 3dda403adcc703f573c95820dd1633bd2fad0984 (commit) - Log ----------------------------------------------------------------- commit f81c051ea41121bf97f11113bd76d2bf19521cd7 Merge: 3dda403adcc703f573c95820dd1633bd2fad0984 f4d5f23e2be8b5a8185cc7dd9a5b3febc06cc3b9 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue May 11 09:28:47 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-7-gf4d5f23
by Michal Čihař 11 May '10

11 May '10

The branch, QA_3_3 has been updated via f4d5f23e2be8b5a8185cc7dd9a5b3febc06cc3b9 (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from fb9d4037cccb2fda09933d57baecea839ad32994 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2984-g3dda403
by Michal Čihař 11 May '10

11 May '10

The branch, master has been updated via 3dda403adcc703f573c95820dd1633bd2fad0984 (commit) from 8a106dbad1443b3f22fe8ecf5a767a7d4d20df04 (commit) - Log ----------------------------------------------------------------- commit 3dda403adcc703f573c95820dd1633bd2fad0984 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue May 11 08:13:38 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nb.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/nb.po b/po/nb.po index 3eb7757..3fe6e17 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-10 14:08+0200\n" +"PO-Revision-Date: 2010-05-11 08:13+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" "Language: nb\n" @@ -2805,10 +2805,9 @@ msgstr "Gå til visning" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:143 -#, fuzzy #| msgid "Recoding engine" msgid "Encoding conversion" -msgstr "Rekodingsmotor" +msgstr "Kodingskonvertering" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:142 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_3-4-gc7b61bd
by Marc Delisle 10 May '10

10 May '10

The branch, TESTING has been updated via c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from 80dc561011fe54101cb1d7b4665e224d9101cc93 (commit) - Log ----------------------------------------------------------------- commit c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b Merge: 80dc561011fe54101cb1d7b4665e224d9101cc93 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:33:06 2010 -0400 Merge branch 'MAINT_3_3_3' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, diff --git a/Documentation.html b/Documentation.html index 2297d29..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 Documentation </h1> </div> diff --git a/README b/README index 674ddef..9edfc16 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.3-rc1 - ----------------- + Version 3.3.3 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2e12514..549775a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.3-rc1'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/translators.html b/translators.html index d08bf66..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_3_3-2-g55bf660
by Marc Delisle 10 May '10

10 May '10

The branch, STABLE has been updated via 55bf660d2fd490787a3fd0cec99ccb2409248efd (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) via 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) via bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) via acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) via 769aec95effaa407fc62778a23549b902fd586d9 (commit) via 69dd779f407a41d9b6ea5b8c7418cfac322368cb (commit) via b6132c51540b24d821641d0a2c7a749bbc55d813 (commit) via 30acade5a799a77321a9a1e2f7f97681f4e8b401 (commit) via 55572a531ca411d9a449f409150ffb0836a111d9 (commit) via 96071655352ab316d2760c141613bebb72c8b2db (commit) via a879b646202566cc5895a7b28c89016bb323e64c (commit) via f73b0e0195be22ee89c244e26301051f4d7a1933 (commit) via d0d24a6e714646a3660c64549382c07375967feb (commit) via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via b3c041bb997b939f96c58a330f9ea9168aef738b (commit) via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via c9d7a662101b57abe754393ab6424b05ab0e685f (commit) via 5113ef198fad589f7952b9982062ce2aba1847d4 (commit) via c454825bca7e291019a89a258d9873cd37f93771 (commit) via f10f34fc6d9a3c894fda81347e78c3e6a0f38fa3 (commit) via 0fc25ac29348166b85a272400c4f28466d343f29 (commit) via 8a7b66f3a0e0a45d87ba60cdbf72b417d80194b9 (commit) via 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit) from 3fe82098c91f784c312ca27d01a07a14515a641d (commit) - Log ----------------------------------------------------------------- commit 55bf660d2fd490787a3fd0cec99ccb2409248efd Merge: 3fe82098c91f784c312ca27d01a07a14515a641d 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:33:06 2010 -0400 Merge branch 'MAINT_3_3_3' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 24 ++++++++++++++++++++++++ Documentation.html | 6 +++--- README | 2 +- libraries/Config.class.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/String.php | 6 +++++- libraries/common.lib.php | 13 ++++++++++++- libraries/display_tbl.lib.php | 2 +- libraries/engines/innodb.lib.php | 2 +- libraries/select_lang.lib.php | 4 ++-- libraries/server_synchronize.lib.php | 16 +++++++++------- navigation.php | 12 +++++++++++- pdf_schema.php | 6 +++--- pmd_general.php | 2 +- scripts/create_tables.sql | 12 +++++++----- tbl_change.php | 2 +- tbl_operations.php | 18 +++++++++++++++--- tbl_structure.php | 2 +- tbl_tracking.php | 14 ++++++++++---- translators.html | 6 +++--- 19 files changed, 111 insertions(+), 40 deletions(-) mode change 100755 => 100644 libraries/export/mediawiki.php diff --git a/ChangeLog b/ChangeLog index a5c87d3..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,30 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.3.0 (2010-05-10) +- patch #2982480 [navi] Do not group if there would be one table in group, + thanks to Lorikeet Lee. +- patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done, thanks to Ankit Gupta - ankitgupta3 +- patch #2984893 [engines] InnoDB storage page emits a warning, + thanks to Madhura Jayaratne - madhuracj +- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, + thanks to Björn Wiberg - bwiberg +- bug #2983066 [interface] Flush table on table operations shows the query twice, + thanks to Martynas Mickevičius - BlinK_ +- bug #2983060, patch #2987900 [interface] Fix initial state of tables in + designer, thanks to Sutharshan Balachandren. +- bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria, thanks to Madhura Jayaratne. +- bug #2974067 [display] non-binary fields shown as hex +- bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql +- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents + 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant diff --git a/Documentation.html b/Documentation.html index 330161f..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3 Documentation </h1> </div> @@ -4999,7 +4999,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> diff --git a/README b/README index ae0af44..9edfc16 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.2 + Version 3.3.3 ------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 63b314a..8cdc051 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.2'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index b6a17a3..8a105f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -97,7 +97,11 @@ class PHPExcel_Shared_String return self::$_isIconvEnabled; } - self::$_isIconvEnabled = function_exists('iconv') ? + // IBM AIX iconv() does not work + self::$_isIconvEnabled = function_exists('iconv') && + !(defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) ? true : false; return self::$_isIconvEnabled; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d9ff7c5..2e18474 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1397,7 +1397,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) $return_value = PMA_formatNumber($value, 0); } - return array($return_value, $unit); + return array(trim($return_value), $unit); } // end of the 'PMA_formatByteDown' function /** @@ -2596,6 +2596,17 @@ function PMA_printable_bit_value($value, $length) { } /** + * Verifies whether the value contains a non-printable character + * + * @uses preg_match() + * @param string $value + * @return boolean + */ +function PMA_contains_nonprintable_ascii($value) { + return preg_match('@[^[:print:]]@', $value); +} + +/** * Converts a BIT type default value * for example, b'010' becomes 010 * diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 41bb987..05feefb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1368,7 +1368,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($_SESSION['tmp_user_values']['display_binary']) { // user asked to see the real contents of BINARY // fields - if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) { $row[$i] = bin2hex($row[$i]); } else { diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 894d7ed..44e53f7 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, ), 'innodb_table_locks' => array( - 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, + 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN, ), 'innodb_thread_concurrency' => array( 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php old mode 100755 new mode 100644 diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index c1589c4..5e5762a 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -68,9 +68,9 @@ function PMA_langCheck() if (! empty($_COOKIE['pma_lang'])) { if (PMA_langSet($_COOKIE['pma_lang'])) { return true; - } elseif (!is_string($_COOKIE['lang'])) { + } elseif (!is_string($_COOKIE['pma_lang'])) { /* Faked request, don't care on localisation */ - $GLOBALS['lang_failed_request'] = 'Yes'; + $GLOBALS['lang_failed_cookie'] = 'Yes'; } else { $GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang']; } diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8978cc6..79948b9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { $display = false; // todo: maybe display some of the queries if they are not too numerous - $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; + $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; @@ -683,12 +683,14 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= ","; } } - $insert_query .= ');'; - if ($display == true) { - PMA_displayQuery($insert_query); - } - PMA_DBI_try_query($insert_query, $trg_link, 0); + $insert_query .= '),'; + } + $insert_query = substr($insert_query, 0, -1); + $insert_query .= ';'; + if ($display == true) { + PMA_displayQuery($insert_query); } + PMA_DBI_try_query($insert_query, $trg_link, 0); } } /** diff --git a/navigation.php b/navigation.php index fb5e52c..17d0193 100644 --- a/navigation.php +++ b/navigation.php @@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false, echo '<ul id="subel' . $element_counter . '" style="display: none">'; } foreach ($tables as $group => $table) { - if (isset($table['is' . $sep . 'group'])) { + // only allow grouping if the group has more than 1 table + if (isset($table['is' . $sep . 'group']) && $table['tab' . $sep . 'count'] > 1) { $common_url_query = $GLOBALS['common_url_query'] . '&tbl_group=' . urlencode($tab_group_full . $group); @@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false, } echo '</li>' . "\n"; } elseif (is_array($table)) { + // the table was not grouped because it is the only one with its prefix + if (isset($table['is' . $sep . 'group'])) { + // get the array with the actual table information + foreach ($table as $value) { + if(is_array($value)) { + $table = $value; + } + } + } $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']); // quick access icon next to each table name echo '<li>' . "\n"; diff --git a/pdf_schema.php b/pdf_schema.php index 552ee32..ce87e97 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; diff --git a/pmd_general.php b/pmd_general.php index 8fd22fd..6956dd6 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -225,7 +225,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" - <?php if (! isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> + <?php if ( isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> <?php $display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]); for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) { diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, @@ -185,7 +187,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) diff --git a/tbl_change.php b/tbl_change.php index f8cc1c0..d7b86dd 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -482,7 +482,7 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting - if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } diff --git a/tbl_operations.php b/tbl_operations.php index d045307..98e5f1b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); + if ($is_maria) { + $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; + $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; + } } if (! empty($_REQUEST['tbl_collation']) @@ -153,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']; + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // and if TRANSACTIONAL was set, the system reports an error; + // I discussed with a Maria developer and he agrees that this + // should not be reported with a Level of Error, so here + // I just ignore it. But there are other 1478 messages + // that it's better to show. + if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) { + $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message']; + } } } } @@ -193,7 +205,7 @@ unset($reread_info); */ require_once './libraries/tbl_links.inc.php'; -if (isset($result)) { +if (isset($result) && empty($zero_rows)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; diff --git a/tbl_structure.php b/tbl_structure.php index 0d966cc..fbe844d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -346,7 +346,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> diff --git a/tbl_tracking.php b/tbl_tracking.php index fbee82a..224ed87 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -417,8 +417,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['ddlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && @@ -465,8 +468,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['dmlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && diff --git a/translators.html b/translators.html index 00f7ab3..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3 official translators list </h1> </div> @@ -446,7 +446,7 @@ </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_3, created. RELEASE_3_3_3
by Marc Delisle 10 May '10

10 May '10

The annotated tag, RELEASE_3_3_3 has been created at 757e7f369a3e087c84ced6b0ff515370b9b8a5d4 (tag) tagging 38445bef624fe105dce758d20b5fad8ec70c950c (commit) replaces RELEASE_3_3_3RC1 tagged by Marc Delisle on Mon May 10 12:33:06 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.3 Marc Delisle (1): 3.3.3 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2983-g8a106db
by Marc Delisle 10 May '10

10 May '10

The branch, master has been updated via 8a106dbad1443b3f22fe8ecf5a767a7d4d20df04 (commit) from 9bb46c6fb5439c047f0de238c00ea196063ceaf8 (commit) - Log ----------------------------------------------------------------- commit 8a106dbad1443b3f22fe8ecf5a767a7d4d20df04 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:31:05 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3b0872..4d26cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,7 +86,7 @@ $Id$ - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3RC1-6-gfb9d403
by Marc Delisle 10 May '10

10 May '10

The branch, QA_3_3 has been updated via fb9d4037cccb2fda09933d57baecea839ad32994 (commit) from 5227d998ec1d59d7f980ad793ddf807f7a58ac3e (commit) - Log ----------------------------------------------------------------- commit fb9d4037cccb2fda09933d57baecea839ad32994 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:30:01 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10bf32a..6649220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_3, updated. RELEASE_3_3_3RC1-1-g38445be
by Marc Delisle 10 May '10

10 May '10

The branch, MAINT_3_3_3 has been updated via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) - Log ----------------------------------------------------------------- commit 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:28:49 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, diff --git a/Documentation.html b/Documentation.html index 2297d29..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 Documentation </h1> </div> diff --git a/README b/README index 674ddef..9edfc16 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.3-rc1 - ----------------- + Version 3.3.3 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9ba5432..8cdc051 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.3-rc1'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/translators.html b/translators.html index d08bf66..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0