- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin history branch, master, updated. 0d4cff8dba336e9c7ab5b9b70868684abe9e0b02
by Marc Delisle 14 Mar '10

14 Mar '10

The branch, master has been updated via 0d4cff8dba336e9c7ab5b9b70868684abe9e0b02 (commit) from ec1bebdde9f098fd068e6e1d2c8627f60c98d64f (commit) - Log ----------------------------------------------------------------- commit 0d4cff8dba336e9c7ab5b9b70868684abe9e0b02 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Mar 14 09:32:15 2010 -0400 ChangeLog split ----------------------------------------------------------------------- Summary of changes: ChangeLogs/ChangeLog-2009 | 254 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 254 insertions(+), 0 deletions(-) create mode 100644 ChangeLogs/ChangeLog-2009 diff --git a/ChangeLogs/ChangeLog-2009 b/ChangeLogs/ChangeLog-2009 new file mode 100644 index 0000000..f5096ab --- /dev/null +++ b/ChangeLogs/ChangeLog-2009 @@ -0,0 +1,254 @@ +---------------------- +phpMyAdmin - ChangeLog +---------------------- + +$Id$ +$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ + +3.2.4.0 (2009-12-02) +- bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status +- bug #2890451 [setup] Inconsistent generated "designer_coords" +- bug #2890443 [mysqli] "No index used in query" exception is reported +- bug #2891250 [ob] Garbled data in navi frame (PHP 5.2.11 bug) +- bug #2887357 [core] Slow loading times with large databases (partial fix) +- bug #2893931 [lang] Typo and empty message ++ [lang] Russian update, thanks to Victor Volkov +- bug #2823599 [edit] UUID Primary Key wrongly updated +- bug #2895894 [structure] Empty default value not set properly +- bug #2897536 [parser] Copying table with bit field with default +- bug #2893221 [core] Statement may not be safe to log in statement format + +3.2.3.0 (2009-10-30) +- patch #2856664 [export] Date, time, and datetime column types now export correctly to + OpenOffice Spreadsheet, thanks to Thomas Pulickal - jemajoign +- patch #2859788 [parser] Double-character delimiters (bug #2846239), + thanks to Thomas Pulickal - jemajoign +- bug #2832600 [export] Slow export when having lots of databases +- bug #2537766 [import] Comments are stripped when editing store procedures +- bug #2852370 [operations] Renaming database deletes triggers +- bug #2872247 [interface] Failed opening required 'mysql_charsets.lib.php', thanks to CyberLeo Kitsana - cyberleo +- bug [structure] "In use" table incorrectly reported as "view" +- bug #2879909 [interface] Removed double htmlspecialchars when editing enum column +- bug #2868328 [relations] Adding foreign key when table name contains a dot +- bug #2883381 [doc] Side effects of MemoryLimit setting +- bug #2826128 [display] Inverting sort order when expression contains a function name + +3.2.2.1 (2009-10-12) +- [security] XSS and SQL injection, thanks to Herman van Rink + +3.2.2.0 (2009-09-13) +- bug #2825293 [structure] Default value for a BIT column +- bug [display] Red arrows were reversed in the list of tables +- bug #2813879 [export] Duplicate empty lines when exporting without comments +- bug #2825919 [export] Trigger export with database name +- bug #2823996 [data] Cannot edit row with no PK and a BIT field +- bug [export] Exporting results of a query which contains a LIMIT clause + inside a subquery +- bug #2837722 [export] Run complex SQL then export does not work +- bug #2839548 [export] Triggers order on export +- bug #2826986 [display] Order by BLOB and range display +- bug [display] After clicking on Show Function or Function, the UPDATE query + is not shown after execution +- bug [structure] Missing validation for BINARY and VARBINARY + +3.2.1.0 (2009-08-09) +- bug #2799009 Login with ipv6 IP address breaks redirect +- bug #2796066 [priv] Inconsistent display of databases list +- bug #2802870 [display] Incorrect overhead value for InnoDB +- bug [display] Incorrect display in replication status, + thanks to Tomas Srnka - tomassrnka +- bug #1601625 [display] The Ignore checkbox is not unchecked for ENUM +- bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php +- bug [features] Incorrect report of missing relational features +- [security] XSS: Insufficient output sanitizing (not exploitable without a valid token) + thanks to Sven Vetsch/Disenchant for informing us in a responsible manner +- bug #2634827 [import] Using DELIMITER produces infinite cycle ++ new language files: uzbek_cyrillic and urbek_latin +- bug #2814109 [search] Right frame is blank +- bug #2816840 [priv] Cannot change a user's details +- bug #2816165 [display] Executed query not always displayed +- bug #2819944 [setup] Incorrect mention of designer_coords +- bug #2821757 [insert] "Insert another new row" no longer worked ++ [lang] Norwegian update, thanks to Sven-Erik Andersen +- bug [core] PMA_pow() can support negative exponents in the pow() case ++ [lang] Brazilian Portuguese update, thanks to Fabio Bucior - fabiobucior +- patch #2822384 [docs] Missing auth_type in docs-example, + thanks to Jürgen Wind - windkiel +- patch #2819728 [display] Slider effect jumping to top of page, + thanks to Jan Radem - summsel +- bug [display] Incorrect computation of overhead stats in server view + for tables under the InnoDB engine ++ [lang] Swedish update, thanks to Björn T. Hallberg + +3.2.0.1 (2009-06-30) +- [security] XSS: Insufficient output sanitizing in bookmarks + +3.2.0.0 (2009-06-15) +- [core] better support for vendor customisation (based on what Debian needs) ++ rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity ++ rfe #2100910 configurable default charset for import ++ rfe #1913541 link to InnoDB status when error 150 occurs ++ rfe #1927189 strip ` from column names on import ++ rfe #1821619 LeftFrameDBSeparator can be an array ++ patch #1821619 [privileges] Extra back reference when editing table-specific + privileges, thanks to Herman van Rink - helmo ++ patch #2356575 [display] Sortable database columns, + thanks to Bryce Thornton - brycethornton +- patch #2486825 [lang] Wrong string in setup script hints, + thanks to Isaac Bennetch - ibennetch +- patch #2498350 [cleanup] XHTML cleanup, thanks to Virsacer - virsacer ++ patch #2494192 [display] Possibility of disabling the sliders, + thanks to Virsacer - virsacer ++ patch #2506831 [privileges] Create user for existing database, + thanks to Herman van Rink and Virsacer ++ patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer +- bug #2414056 [auth] AllowNoPasswordRoot error message is too vague +- patch #2596230 [XHTML] View table headers/footers completely, + thanks to Virsacer - virsacer +- patch #2602633 [core] support column name having square brackets, + thanks to Herman van Rink - helmo ++ [lang] Lithuanian update, thanks to Rytis Slatkevicius - rytis_s ++ [auth] New setting AllowNoPassword (supercedes AllowNoPasswordRoot) that + applies to all accounts (even the anonymous user) +- patch #2652972 [relation] Missing code with hashing for relationship + editing, thanks to knittl - knittl ++ rfe #2123386 Added option to disable mcrypt warning. +- bug #2648502 Request-URI Too Large error from Location header ++ rfe #1731967 Check for relations support on main page. ++ rfe #2186820 Explanation for using Host table. ++ rfe #1369509 Link to download more themes. ++ rfe #1666487 Add option to generate password on change password page. ++ rfe #1694104 Allow logging of user status with Apache. +- patch #2649087 None default is different than other None in some languages. ++ [lang] Chinese Simplified update, thanks to Shanyan Baishui - rimyxp +- patch #2550286 [display] Sort arrows problem, thanks to Virsacer - virsacer +- [security] warn about existence of config directory on main page ++ patch #2706761 [lang] Polish update, + thanks to Pawel Smolinski - zipoking ++ patch #2715142 [export] (rfe 2416960, escape new line in CSV export) + thanks to Derek Schaefer - drummingds1 +- patch #2727250 Optimizations for PHP loops + thanks to Haeber +- bug #2650776 [import] SQL_MODE not saved during Partial Import +- patch #1863739 [auth] cache control missing (PHP-CGI), thanks to stmfd +- patch #2750541 [parser] Incorrect parsing of constraints in ALTER TABLE, + thanks to Yannick Betemps - arkhee ++ patch #2735162 [status] Server status - replication, + thanks to Tomas Srnka - tomassrnka ++ patch #2745215 [edit] Multi-row change with "]" improved, + thanks to Virsacer - virsacer ++ rfe #2657696 Automatically copy generated password +- bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view ++ patch #2665440 Detect mcrypt initialization failure ++ [lang] Galician update, thanks to Xosé Calvo - xosecalvo ++ [lang] Swedish update, thanks to Björn T. Hallberg ++ [lang] Norwegian update, thanks to Sven-Erik Andersen ++ [lang] Catalan update, thanks to Xavier Navarro ++ [lang] Finnish update, thanks to Jouni Kahkonen ++ [lang] Hungarian update, thanks to Jozsef Tamas Herczeg - dodika + +3.1.6.0 (not released) +- bug #2785912 [doc] no ON UPDATE CURRENT_TIMESTAMP in list of attributes + +3.1.5.0 (2009-05-15) +- patch #2739001 [export] XML does not allow spaces in element names, + thanks to Derek Schaefer - drummingds1 +- bug #2780722 [import] Incorrect maximum file size +- bug #2780356 [calendar] Null checkbox not unchecked when date is chosen +- bug [calendar] js error "window.parent.addEvent is not a function" +- patch #2773818 [export] Invalid "Content-Encoding" header, + thanks to abignale - abignale +- bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view +- bug #2784400 [parser] INVOKER not understood by parser +- [core] Compatibility with PHP 5.3.0RC2 + +3.1.4.0 (2009-04-25) ++ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + thanks to JT Justman - jtjustman +- bug #2491017 [operations] ANSI mode not supported (db rename and table move) +- bug #2609346 [operations] Fix copying views. +- rfe #2127983 Readd documentation link, it does not protect against anything. +- bug #1675249 [doc] Apache reverse proxy and cookies FAQ +- bug #2682140 UUID() and CURRENT_USER() should not accept arguments +- patch #2682833 [core] Fatal error: Call to a member function isDisplayed(), + thanks to Christian Rodriguez - judas_iscariote +- patch #2702772 [lang] Duplicate sentence in Polish, + thanks to Pawel Smolinski - zipoking +- patch #2709040 [doc] Wrong link in ChangeLog formatter, + thanks to Petr Vorel - pevik +- patch #2715417 [interface] Fixed truncation of enum/set values containing parenthesis + thanks to Marco Moreno - mmoreno ++ [lang] Spanish update, thanks to Daniel Hinostroza +- bug #2724844 Add Fields: Add index is missing quotes + thanks to Luke Armstrong +- bug #2740550 [interface] Using textarea CharEditing drops default values +- bug #2729191 [config] CheckConfigurationPermissions = false is worthless +- bug #2687046 [export] Structure export: Null always YES +- [doc] typos, thanks to Cédric Corazza + +3.1.3.2 (2009-04-14) +- [security] Insufficient output sanitizing when generating configuration file + +3.1.3.1 (2009-03-24) +- [security] HTTP Response Splitting and file inclusion vulnerabilities +- [security] XSS vulnerability on export page +- [security] Insufficient output sanitizing when generating configuration file + +3.1.3.0 (2009-02-28) ++ [lang] Turkish update, thanks to Burak Yavuz +- patch #2496403 [display] Multi-row change with "]", + thanks to Virsacer - virsacer +- bug #2027720 [parser] Missing space after BINARY used as cast +- patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3, + thanks to Giovanni Giacobbi - themnemonic +- bug [display] Message "Bookmark created" is not displaying ++ [display] Show AUTO_INCREMENT instead of A_I when in vertical mode +- patch #2538358 [display] Conditions for relational display field, + thanks to Virsacer - virsacer ++ [lang] Mongolian update, thanks to Bayarsaikhan Enkhtaivan - bayaraa +- patch #2553372 [display] DB comment tooltips not shown on navi, + thanks to Erdem - ahard +- patch #2561433 [structure] Display true number of rows in a view + if it contains less than MaxExactCountViews, + thanks to Virsacer - virsacer ++ [lang] Polish update, thanks to Fixer - fixeron +- bug #2568722 [designer] Compound key not shown +- patch #2550323 [XHTML] in server_databases.php, thanks to Virsacer - virsacer +- patch #2358861 [navi] Row count tooltip wrong for information_schema, + thanks to Herman van Rink - helmo +- bug #2565948 [core] Changing the connection collation changed the client + charset. ++ [lang] Romanian update, thanks to Sergiu Bivol - sbivol +- patch #1760205 [data] Insert as new row: BLOB is lost, + thanks to Herman van Rink - helmo ++ [lang] Georgian update, thanks to George Machitidze + +3.1.2.0 (2009-01-19) +- bug #1253252 [display] Can't NULL a column with relation defined +- bug #2009500 [SQL] Small improvements in generated SQL (partial fix) +- bug #1963184 [export] YAML export improvement, + thanks to Bryce Thornton - brycethornton ++ [lang] Dutch update, thanks to Herman van Rink - helmo +- patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3, + thanks to Alex Frase - atfrase +- bug #2417058 [properties] Edit fields: losing auto-increment setting +- patch #2444082 [changelog] changelog.php linkifies one link wrong, + thanks to Robert Xiao - nneonneo +- bug #2363653 [properties] Various problems with table structure +- bug [display] BIT field contents disappear when edited ++ [lang] Czech update, thanks to Ondřej Vadinský. +- bug #2461735 [operations] Table operations adds "row_format" +- bug #2445213 [export] Commas for CSV Excel 2008 for Mac +- bug #2397877 [core] ForceSSL and http auth_type +- bug #2473127 [display] Deleting rows displays tbl structure, not contents +- patch #2478940 [core] PHP 5.2+ warning does not work, + thanks to Jürgen Wind - windkiel +- bug #2416418 [privileges] Escaping special characters + + --- Older ChangeLogs can be found on our project website --- + http://www.phpmyadmin.net/old-stuff/ChangeLogs/ + +# vim: et ts=4 sw=4 sts=4 +# vim: ft=changelog fenc=utf-8 encoding=utf-8 +# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>8&&getline(v\:lnum)!~'^#' +# vim: fdn=1 fdm=expr hooks/post-receive -- phpMyAdmin history

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-222-g279d9c2
by Marc Delisle 14 Mar '10

14 Mar '10

The branch, master has been updated via 279d9c23d404eea626683652dfd1ca43a14663c4 (commit) from a3bbb9aadae0497d796067d40d1ae9de72973a7f (commit) - Log ----------------------------------------------------------------- commit 279d9c23d404eea626683652dfd1ca43a14663c4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Mar 14 09:13:44 2010 -0400 rename this variable to avoid confusion with SQL primary keys, for example ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 86 ++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 602ed95..19515f9 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1656,22 +1656,22 @@ function PMA_displayVerticalTable() */ function PMA_displayTable_checkConfigParams() { - $sql_key = md5($GLOBALS['sql_query']); + $sql_md5 = md5($GLOBALS['sql_query']); - $_SESSION['tmp_user_values']['query'][$sql_key]['sql'] = $GLOBALS['sql_query']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['sql'] = $GLOBALS['sql_query']; if (PMA_isValid($_REQUEST['disp_direction'], array('horizontal', 'vertical', 'horizontalflipped'))) { - $_SESSION['tmp_user_values']['query'][$sql_key]['disp_direction'] = $_REQUEST['disp_direction']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] = $_REQUEST['disp_direction']; unset($_REQUEST['disp_direction']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['disp_direction'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction'] = $GLOBALS['cfg']['DefaultDisplay']; } if (PMA_isValid($_REQUEST['repeat_cells'], 'numeric')) { - $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'] = $_REQUEST['repeat_cells']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells'] = $_REQUEST['repeat_cells']; unset($_REQUEST['repeat_cells']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } // as this is a form value, the type is always string so we cannot @@ -1679,81 +1679,81 @@ function PMA_displayTable_checkConfigParams() if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows']) || $_REQUEST['session_max_rows'] == 'all') { - $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'] = $_REQUEST['session_max_rows']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'] = $GLOBALS['cfg']['MaxRows']; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'] = $GLOBALS['cfg']['MaxRows']; } if (PMA_isValid($_REQUEST['pos'], 'numeric')) { - $_SESSION['tmp_user_values']['query'][$sql_key]['pos'] = $_REQUEST['pos']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] = $_REQUEST['pos']; unset($_REQUEST['pos']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['pos'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['pos'] = 0; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['pos'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['pos'] = 0; } if (PMA_isValid($_REQUEST['display_text'], array('P', 'F'))) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_text'] = $_REQUEST['display_text']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] = $_REQUEST['display_text']; unset($_REQUEST['display_text']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['display_text'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_text'] = 'P'; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text'] = 'P'; } if (PMA_isValid($_REQUEST['relational_display'], array('K', 'D'))) { - $_SESSION['tmp_user_values']['query'][$sql_key]['relational_display'] = $_REQUEST['relational_display']; + $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] = $_REQUEST['relational_display']; unset($_REQUEST['relational_display']); - } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['relational_display'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['relational_display'] = 'K'; + } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'])) { + $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display'] = 'K'; } if (isset($_REQUEST['display_binary'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; unset($_REQUEST['display_binary']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary']); + unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary']); } else { // selected by default because some operations like OPTIMIZE TABLE // and all queries involving functions return "binary" contents, // according to low-level field flags - $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary'] = true; } if (isset($_REQUEST['display_binary_as_hex'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] = true; unset($_REQUEST['display_binary_as_hex']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex']); + unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex']); } else { // display_binary_as_hex config option if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && true === $GLOBALS['cfg']['DisplayBinaryAsHex']) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] = true; } } if (isset($_REQUEST['display_blob'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['display_blob'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob'] = true; unset($_REQUEST['display_blob']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_key]['display_blob']); + unset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']); } if (isset($_REQUEST['hide_transformation'])) { - $_SESSION['tmp_user_values']['query'][$sql_key]['hide_transformation'] = true; + $_SESSION['tmp_user_values']['query'][$sql_md5]['hide_transformation'] = true; unset($_REQUEST['hide_transformation']); } elseif (isset($_REQUEST['display_options_form'])) { // we know that the checkbox was unchecked - unset($_SESSION['tmp_user_values']['query'][$sql_key]['hide_transformation']); + unset($_SESSION['tmp_user_values']['query'][$sql_md5]['hide_transformation']); } // move current query to the last position, to be removed last // so only least executed query will be removed if maximum remembered queries // limit is reached - $tmp = $_SESSION['tmp_user_values']['query'][$sql_key]; - unset($_SESSION['tmp_user_values']['query'][$sql_key]); - $_SESSION['tmp_user_values']['query'][$sql_key] = $tmp; + $tmp = $_SESSION['tmp_user_values']['query'][$sql_md5]; + unset($_SESSION['tmp_user_values']['query'][$sql_md5]); + $_SESSION['tmp_user_values']['query'][$sql_md5] = $tmp; // do not exceed a maximum number of queries to remember if (count($_SESSION['tmp_user_values']['query']) > 10) { @@ -1762,16 +1762,16 @@ function PMA_displayTable_checkConfigParams() } // populate query configuration - $_SESSION['tmp_user_values']['display_text'] = $_SESSION['tmp_user_values']['query'][$sql_key]['display_text']; - $_SESSION['tmp_user_values']['relational_display'] = $_SESSION['tmp_user_values']['query'][$sql_key]['relational_display']; - $_SESSION['tmp_user_values']['display_binary'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary']) ? true : false; - $_SESSION['tmp_user_values']['display_binary_as_hex'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex']) ? true : false; - $_SESSION['tmp_user_values']['display_blob'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_blob']) ? true : false; - $_SESSION['tmp_user_values']['hide_transformation'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['hide_transformation']) ? true : false; - $_SESSION['tmp_user_values']['pos'] = $_SESSION['tmp_user_values']['query'][$sql_key]['pos']; - $_SESSION['tmp_user_values']['max_rows'] = $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows']; - $_SESSION['tmp_user_values']['repeat_cells'] = $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells']; - $_SESSION['tmp_user_values']['disp_direction'] = $_SESSION['tmp_user_values']['query'][$sql_key]['disp_direction']; + $_SESSION['tmp_user_values']['display_text'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['display_text']; + $_SESSION['tmp_user_values']['relational_display'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['relational_display']; + $_SESSION['tmp_user_values']['display_binary'] = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary']) ? true : false; + $_SESSION['tmp_user_values']['display_binary_as_hex'] = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex']) ? true : false; + $_SESSION['tmp_user_values']['display_blob'] = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['display_blob']) ? true : false; + $_SESSION['tmp_user_values']['hide_transformation'] = isset($_SESSION['tmp_user_values']['query'][$sql_md5]['hide_transformation']) ? true : false; + $_SESSION['tmp_user_values']['pos'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['pos']; + $_SESSION['tmp_user_values']['max_rows'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; + $_SESSION['tmp_user_values']['repeat_cells'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['repeat_cells']; + $_SESSION['tmp_user_values']['disp_direction'] = $_SESSION['tmp_user_values']['query'][$sql_md5]['disp_direction']; /* * debugging hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-221-ga3bbb9a
by Marc Delisle 14 Mar '10

14 Mar '10

The branch, master has been updated via a3bbb9aadae0497d796067d40d1ae9de72973a7f (commit) via b686640a06916ddc65bc46f5a057990914ac091a (commit) from 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b (commit) - Log ----------------------------------------------------------------- commit a3bbb9aadae0497d796067d40d1ae9de72973a7f Merge: 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b b686640a06916ddc65bc46f5a057990914ac091a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Mar 14 08:48:11 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24103f8..f71bb44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant +- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 1656964..602ed95 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1674,7 +1674,11 @@ function PMA_displayTable_checkConfigParams() $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } - if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric') || $_REQUEST['session_max_rows'] == 'all') { + // as this is a form value, the type is always string so we cannot + // use PMA_isValid($_REQUEST['session_max_rows'], 'integer') + if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') + && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows']) + || $_REQUEST['session_max_rows'] == 'all') { $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-54-gb686640
by Marc Delisle 14 Mar '10

14 Mar '10

The branch, QA_3_3 has been updated via b686640a06916ddc65bc46f5a057990914ac091a (commit) from 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f8b70..f2e37d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant +- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 4f16ca5..f4809d3 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1670,7 +1670,11 @@ function PMA_displayTable_checkConfigParams() $_SESSION['tmp_user_values']['query'][$sql_key]['repeat_cells'] = $GLOBALS['cfg']['RepeatCells']; } - if (PMA_isValid($_REQUEST['session_max_rows'], 'numeric') || $_REQUEST['session_max_rows'] == 'all') { + // as this is a form value, the type is always string so we cannot + // use PMA_isValid($_REQUEST['session_max_rows'], 'integer') + if ((PMA_isValid($_REQUEST['session_max_rows'], 'numeric') + && (int) $_REQUEST['session_max_rows'] == $_REQUEST['session_max_rows']) + || $_REQUEST['session_max_rows'] == 'all') { $_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'] = $_REQUEST['session_max_rows']; unset($_REQUEST['session_max_rows']); } elseif (empty($_SESSION['tmp_user_values']['query'][$sql_key]['max_rows'])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-219-g87dd6b3
by Marc Delisle 12 Mar '10

12 Mar '10

The branch, master has been updated via 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b (commit) via 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (commit) from c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) - Log ----------------------------------------------------------------- commit 87dd6b3ceeca9ed8e3feba529c9b4302eaf32b0b Merge: c4bdb187033c908982e814af1b254d28ab3b1d3e 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Mar 12 17:16:58 2010 -0500 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 2 +- db_printview.php | 2 +- db_structure.php | 6 +++++- export.php | 7 +++---- libraries/Table.class.php | 32 ++++++++++++++++++++++++++++++-- libraries/display_export.lib.php | 5 +---- tbl_printview.php | 7 +++---- tbl_structure.php | 7 +++---- 9 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index dad74c5..24103f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Uzbek update, thanks to Orzu Samarqandiy 3.3.2.0 (not yet released) +- patch #2969449 [core] Name for MERGE engine varies depending on the + MySQL version, thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/db_operations.php b/db_operations.php index bcee977..c09e2e1 100644 --- a/db_operations.php +++ b/db_operations.php @@ -110,7 +110,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // do not copy the data from a Merge table // note: on the calling FORM, 'data' means 'structure and data' - if ($tables_full[$each_table]['Engine'] == 'MRG_MyISAM') { + if (PMA_Table::isMerge($db, $each_table)) { if ($this_what == 'data') { $this_what = 'structure'; } diff --git a/db_printview.php b/db_printview.php index 277566d..e7c0547 100644 --- a/db_printview.php +++ b/db_printview.php @@ -117,7 +117,7 @@ else { $sum_entries = $sum_size = 0; $odd_row = true; foreach ($tables as $sts_data) { - if (strtoupper($sts_data['ENGINE']) == 'MRG_MYISAM' + if (PMA_Table::isMerge($db, $sts_data['TABLE_NAME']) || strtoupper($sts_data['ENGINE']) == 'FEDERATED') { $merged_size = true; } else { diff --git a/db_structure.php b/db_structure.php index c0df159..1d92330 100644 --- a/db_structure.php +++ b/db_structure.php @@ -225,7 +225,11 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Both are aliases for MERGE + case 'MRG_MyISAM' : case 'MRG_MYISAM' : + case 'MERGE' : case 'BerkeleyDB' : // Merge or BerkleyDB table: Only row count is accurate. if ($is_show_stats) { @@ -254,7 +258,7 @@ foreach ($tables as $keyname => $each_table) { } } // end switch - if ('MRG_MYISAM' != $each_table['ENGINE']) { + if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) { $sum_entries += $each_table['TABLE_ROWS']; } diff --git a/export.php b/export.php index 1f7b39e..5399d43 100644 --- a/export.php +++ b/export.php @@ -439,7 +439,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($current_db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($current_db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { break 3; @@ -488,7 +488,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { break 2; @@ -537,8 +537,7 @@ if ($export_type == 'server') { // If this is an export of a single view, we have to export data; // for example, a PDF report // if it is a merge table, no data is exported - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (isset($GLOBALS[$what . '_data']) && ! $is_merge) { + if (isset($GLOBALS[$what . '_data']) && ! PMA_Table::isMerge($db, $table)) { if (!empty($sql_query)) { // only preg_replace if needed if (!empty($add_query)) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index b2b6963..25e3709 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -238,6 +238,31 @@ class PMA_Table return $type == 'VIEW'; } + /** + * Checks if this is a merge table + * + * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. + * + * @param string the database name + * @param string the table name + * @return boolean true if it is a merge table + * @access public + */ + public function isMerge($db = null, $table = null) + { + // if called static, with parameters + if (! empty($db) && ! empty($table)) { + $engine = PMA_Table::sGetStatusInfo($db, $table, 'ENGINE', null, true); + } + // if called as an object + // does not work yet, because $this->settings[] is not filled correctly + else if (! empty($this)) { + $engine = $this->get('ENGINE'); + } + + return (! empty($engine) && ((strtoupper($engine) == 'MERGE') || (strtoupper($engine) == 'MRG_MYISAM'))); + } + static public function sGetToolTip($db, $table) { return PMA_Table::sGetStatusInfo($db, $table, 'Comment') @@ -254,9 +279,10 @@ class PMA_Table * @param string $table * @param string $info * @param boolean $force_read + * @param boolean if true, disables error message * @return mixed */ - static public function sGetStatusInfo($db, $table, $info = null, $force_read = false) + static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false) { if (! isset(PMA_Table::$cache[$db][$table]) || $force_read) { PMA_DBI_get_tables_full($db, $table); @@ -274,7 +300,9 @@ class PMA_Table } if (! isset(PMA_Table::$cache[$db][$table][$info])) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + if (! $disable_error) { + trigger_error('unknown table status: ' . $info, E_USER_WARNING); + } return false; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index a680995..186b0d3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,10 +104,7 @@ echo PMA_pluginGetJavascript($export_list); //]]> </script> -<?php - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (strlen($table) && ! isset($num_tables) && ! $is_merge) { -?> +<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?> <div class="formelementrow"> <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; diff --git a/tbl_printview.php b/tbl_printview.php index c43efd9..3cd2868 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -278,10 +278,9 @@ foreach ($the_tables as $key => $table) { } if ($nonisam == false) { // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($db, $table); + list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length']); diff --git a/tbl_structure.php b/tbl_structure.php index 4be5767..51b001e 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -625,10 +625,9 @@ if ($cfg['ShowStats']) { } // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($GLOBALS['db'], $GLOBALS['table']); + // this is to display for example 261.2 MiB instead of 268k KiB $max_digits = 5; $decimals = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-53-g7c818d0
by Marc Delisle 12 Mar '10

12 Mar '10

The branch, QA_3_3 has been updated via 7c818d046a4c9f01a8e94b55a0726a1cc3d6a60d (commit) from 4a53eb19160936770d32244939ee82906e0f88c8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ db_operations.php | 2 +- db_printview.php | 2 +- db_structure.php | 6 +++++- export.php | 7 +++---- libraries/Table.class.php | 32 ++++++++++++++++++++++++++++++-- libraries/display_export.lib.php | 5 +---- tbl_printview.php | 7 +++---- tbl_structure.php | 7 +++---- 9 files changed, 49 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index f120b5a..26f8b70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ 3.3.2.0 (not yet released) +- patch #2969449 [core] Name for MERGE engine varies depending on the + MySQL version, thanks to Dieter Adriaenssens - ruleant 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/db_operations.php b/db_operations.php index 624007e..f051877 100644 --- a/db_operations.php +++ b/db_operations.php @@ -110,7 +110,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // do not copy the data from a Merge table // note: on the calling FORM, 'data' means 'structure and data' - if ($tables_full[$each_table]['Engine'] == 'MRG_MyISAM') { + if (PMA_Table::isMerge($db, $each_table)) { if ($this_what == 'data') { $this_what = 'structure'; } diff --git a/db_printview.php b/db_printview.php index bf51015..d656f0e 100644 --- a/db_printview.php +++ b/db_printview.php @@ -117,7 +117,7 @@ else { $sum_entries = $sum_size = 0; $odd_row = true; foreach ($tables as $sts_data) { - if (strtoupper($sts_data['ENGINE']) == 'MRG_MYISAM' + if (PMA_Table::isMerge($db, $sts_data['TABLE_NAME']) || strtoupper($sts_data['ENGINE']) == 'FEDERATED') { $merged_size = true; } else { diff --git a/db_structure.php b/db_structure.php index fa18390..845ffd3 100644 --- a/db_structure.php +++ b/db_structure.php @@ -226,7 +226,11 @@ foreach ($tables as $keyname => $each_table) { } //$display_rows = ' - '; break; + // Mysql 5.0.x (and lower) uses MRG_MyISAM and MySQL 5.1.x (and higher) uses MRG_MYISAM + // Both are aliases for MERGE + case 'MRG_MyISAM' : case 'MRG_MYISAM' : + case 'MERGE' : case 'BerkeleyDB' : // Merge or BerkleyDB table: Only row count is accurate. if ($is_show_stats) { @@ -255,7 +259,7 @@ foreach ($tables as $keyname => $each_table) { } } // end switch - if ('MRG_MYISAM' != $each_table['ENGINE']) { + if (! PMA_Table::isMerge($db, $each_table['TABLE_NAME'])) { $sum_entries += $each_table['TABLE_ROWS']; } diff --git a/export.php b/export.php index f8c9914..dae4cf4 100644 --- a/export.php +++ b/export.php @@ -439,7 +439,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($current_db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($current_db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); if (!PMA_exportData($current_db, $table, $crlf, $err_url, $local_query)) { break 3; @@ -488,7 +488,7 @@ if ($export_type == 'server') { } } // if this is a view or a merge table, don't export data - if (isset($GLOBALS[$what . '_data']) && !($is_view || (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0))) { + if (isset($GLOBALS[$what . '_data']) && !($is_view || PMA_Table::isMerge($db, $table))) { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table); if (!PMA_exportData($db, $table, $crlf, $err_url, $local_query)) { break 2; @@ -537,8 +537,7 @@ if ($export_type == 'server') { // If this is an export of a single view, we have to export data; // for example, a PDF report // if it is a merge table, no data is exported - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (isset($GLOBALS[$what . '_data']) && ! $is_merge) { + if (isset($GLOBALS[$what . '_data']) && ! PMA_Table::isMerge($db, $table)) { if (!empty($sql_query)) { // only preg_replace if needed if (!empty($add_query)) { diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 0f407e7..de2cfe2 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -238,6 +238,31 @@ class PMA_Table return $type == 'VIEW'; } + /** + * Checks if this is a merge table + * + * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. + * + * @param string the database name + * @param string the table name + * @return boolean true if it is a merge table + * @access public + */ + public function isMerge($db = null, $table = null) + { + // if called static, with parameters + if (! empty($db) && ! empty($table)) { + $engine = PMA_Table::sGetStatusInfo($db, $table, 'ENGINE', null, true); + } + // if called as an object + // does not work yet, because $this->settings[] is not filled correctly + else if (! empty($this)) { + $engine = $this->get('ENGINE'); + } + + return (! empty($engine) && ((strtoupper($engine) == 'MERGE') || (strtoupper($engine) == 'MRG_MYISAM'))); + } + static public function sGetToolTip($db, $table) { return PMA_Table::sGetStatusInfo($db, $table, 'Comment') @@ -254,9 +279,10 @@ class PMA_Table * @param string $table * @param string $info * @param boolean $force_read + * @param boolean if true, disables error message * @return mixed */ - static public function sGetStatusInfo($db, $table, $info = null, $force_read = false) + static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false) { if (! isset(PMA_Table::$cache[$db][$table]) || $force_read) { PMA_DBI_get_tables_full($db, $table); @@ -274,7 +300,9 @@ class PMA_Table } if (! isset(PMA_Table::$cache[$db][$table][$info])) { - trigger_error('unknown table status: ' . $info, E_USER_WARNING); + if (! $disable_error) { + trigger_error('unknown table status: ' . $info, E_USER_WARNING); + } return false; } diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index a680995..186b0d3 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,10 +104,7 @@ echo PMA_pluginGetJavascript($export_list); //]]> </script> -<?php - $is_merge = ! PMA_Table::isView($db, $table) && (strcasecmp(PMA_Table::sGetStatusInfo($db, $table, 'Engine'),'MRG_MYISAM') == 0); - if (strlen($table) && ! isset($num_tables) && ! $is_merge) { -?> +<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?> <div class="formelementrow"> <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; diff --git a/tbl_printview.php b/tbl_printview.php index 949a78a..c5b17ab 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -279,10 +279,9 @@ foreach ($the_tables as $key => $table) { } if ($nonisam == false) { // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($db, $table); + list($data_size, $data_unit) = PMA_formatByteDown($showtable['Data_length']); if ($mergetable == false) { list($index_size, $index_unit) = PMA_formatByteDown($showtable['Index_length']); diff --git a/tbl_structure.php b/tbl_structure.php index 750fbdc..0d966cc 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -612,10 +612,9 @@ if ($cfg['ShowStats']) { } // Gets some sizes - $mergetable = false; - if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { - $mergetable = true; - } + + $mergetable = PMA_Table::isMerge($GLOBALS['db'], $GLOBALS['table']); + // this is to display for example 261.2 MiB instead of 268k KiB $max_digits = 5; $decimals = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-217-gc4bdb18
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, master has been updated via c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) via 105c33fe34136245ba47e36660000c882adc4052 (commit) from bbc3d3debfc3ae86aaab661a536170293c7c9cf7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 9023b96..269ef44 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -93,6 +93,7 @@ fi LC_ALL=C date -u > RELEASE-DATE-${version} # Building Documentation.txt +echo "* Generating Documentation.txt" LC_ALL=C w3m -dump Documentation.html > Documentation.txt # Remove test directory from package to avoid Path disclosure messages @@ -119,28 +120,28 @@ for kit in $KITS ; do for comp in $COMPRESSIONS ; do case $comp in tbz|tgz) - echo "Creating $name.tar" + echo "* Creating $name.tar" tar cf $name.tar $name if [ $comp = tbz ] ; then - echo "Creating $name.tar.bz2" + echo "* Creating $name.tar.bz2" bzip2 -9k $name.tar fi if [ $comp = tgz ] ; then - echo "Creating $name.tar.gz" + echo "* Creating $name.tar.gz" gzip -9c $name.tar > $name.tar.gz fi rm $name.tar ;; zip) - echo "Creating $name.zip" + echo "* Creating $name.zip" zip -q -9 -r $name.zip $name ;; zip-7z) - echo "Creating $name.zip" + echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null ;; 7z) - echo "Creating $name.7z" + echo "* Creating $name.7z" 7za a -bd $name.7z $name > /dev/null ;; *) @@ -178,6 +179,14 @@ if [ $# -gt 0 ] ; then tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -` echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch + if echo $version | grep '[a-z_-]' ; then + echo "* Tagging release as TESTING" + git tag -a -f -m "Released $version" TESTING $branch + else + echo "* Tagging release as STABLE" + git tag -a -f -m "Released $version" STABLE $branch + fi + echo " Dont forget to push tags using: git push --tags" ;; *) echo "Unknown parameter: $1!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-395-g4862806
by Michal Čihař 12 Mar '10

12 Mar '10

The branch, gettext has been updated via 486280626a298d3126e97f32b130b0e8895177a6 (commit) via ba106a107a958f19003c2e83dfc72f297279e460 (commit) via 2efb431b5ce2b80f77db7b3ee4b714f5b9de0f65 (commit) via c4bdb187033c908982e814af1b254d28ab3b1d3e (commit) via 105c33fe34136245ba47e36660000c882adc4052 (commit) from 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 (commit) - Log ----------------------------------------------------------------- commit 486280626a298d3126e97f32b130b0e8895177a6 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 14:00:11 2010 +0100 Adjus languages cleanup for gettext. commit ba106a107a958f19003c2e83dfc72f297279e460 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 13:50:07 2010 +0100 Message for generating mo files. commit 2efb431b5ce2b80f77db7b3ee4b714f5b9de0f65 Merge: 4606ddf16f1c7c6247134e3b1ceafe4204b7d335 c4bdb187033c908982e814af1b254d28ab3b1d3e Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 12 13:49:50 2010 +0100 Merge branch 'master' into gettext ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 22 +++++++++++---- scripts/lang-cleanup.sh | 64 ++++++++++---------------------------------- 2 files changed, 31 insertions(+), 55 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 51ff185..8c321be 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -93,6 +93,7 @@ fi LC_ALL=C date -u > RELEASE-DATE-${version} # Building Documentation.txt +echo "* Generating Documentation.txt" LC_ALL=C w3m -dump Documentation.html > Documentation.txt # Check for gettext support @@ -104,6 +105,7 @@ fi # Generate mo files if [ $GETTEXT -eq 1 ] ; then + echo "* Generating mo files" ./scripts/generate-mo fi @@ -131,28 +133,28 @@ for kit in $KITS ; do for comp in $COMPRESSIONS ; do case $comp in tbz|tgz) - echo "Creating $name.tar" + echo "* Creating $name.tar" tar cf $name.tar $name if [ $comp = tbz ] ; then - echo "Creating $name.tar.bz2" + echo "* Creating $name.tar.bz2" bzip2 -9k $name.tar fi if [ $comp = tgz ] ; then - echo "Creating $name.tar.gz" + echo "* Creating $name.tar.gz" gzip -9c $name.tar > $name.tar.gz fi rm $name.tar ;; zip) - echo "Creating $name.zip" + echo "* Creating $name.zip" zip -q -9 -r $name.zip $name ;; zip-7z) - echo "Creating $name.zip" + echo "* Creating $name.zip" 7za a -bd -tzip $name.zip $name > /dev/null ;; 7z) - echo "Creating $name.7z" + echo "* Creating $name.7z" 7za a -bd $name.7z $name > /dev/null ;; *) @@ -190,6 +192,14 @@ if [ $# -gt 0 ] ; then tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -` echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch + if echo $version | grep '[a-z_-]' ; then + echo "* Tagging release as TESTING" + git tag -a -f -m "Released $version" TESTING $branch + else + echo "* Tagging release as STABLE" + git tag -a -f -m "Released $version" STABLE $branch + fi + echo " Dont forget to push tags using: git push --tags" ;; *) echo "Unknown parameter: $1!" diff --git a/scripts/lang-cleanup.sh b/scripts/lang-cleanup.sh index d8688e9..b09674f 100755 --- a/scripts/lang-cleanup.sh +++ b/scripts/lang-cleanup.sh @@ -6,71 +6,37 @@ # Script for removing language selection from phpMyAdmin if [ $# -lt 1 ] ; then - echo "Usage: lang-cleanup.sh type ..." + echo "Usage: lang-cleanup.sh type" echo "Type can be one of:" echo " all-languages - nothing will be done" - echo " all-languages-utf-8-only - non utf-8 languages will be deleted" - echo " language - keeps utf-8 version of language" - echo " language-charset - keeps this exact language" + echo " english - no translations will be kept" + echo " langcode - keeps language" echo - echo "Types can be entered multiple times, all matched languages will be kept" + echo "Languages can be scpecified multiple times" exit 1 fi -# Construct expressions for find +# Expression for find match="" for type in "$@" ; do case $type in all-languages) - match="$match -and -false" + exit 0 ;; - all-languages-utf-8-only) - match="$match -and -not -name *-utf-8.inc.php" + english) + rm -rf po + rm -rf locale + exit 0 ;; *) - if [ -f lang/$type-utf-8.inc.php ] ; then - match="$match -and -not -name $type-utf-8.inc.php" - elif [ -f lang/$type.inc.php ] ; then - match="$match -and -not -name $type.inc.php" - else - echo "ERROR: $type seems to be wrong!" - exit 2 - fi + match="$match -and -not -name $type.po -and -not -path locale/$type/LC_MESSAGES/phpmyadmin.mo" ;; esac done # Delete unvanted languages -find lang -name \*.inc.php $match -print0 | xargs -0r rm - -# Cleanup libraries/select_lang.lib.php - -# Find languages we have -langmatch="$(awk -F, \ - 'BEGIN { pr = 1 } ; - /^\);/ { pr = 1 } ; - {if(!pr) print $2;}; - /^\$available_languages/ { pr = 0 };' \ - libraries/select_lang.lib.php \ - | tr -d \' \ - | while read lng ; do if [ -f lang/$lng.inc.php ] ; then echo $lng ; fi ; done \ - | tr '\n' '|' \ - | sed 's/|$//' \ - )" - -# Prepare working copy -tmp=`mktemp libraries/select_lang.lib.php.XXXX` -cat libraries/select_lang.lib.php > $tmp - -# Remove languages we don't have -awk -F, \ - 'BEGIN { pr = 1 } ; - /^\);/ { pr = 1 } ; - {if(pr) print $0;}; - /'$langmatch'/ {if (!pr) print $0;}; - /^\$available_languages/ { pr = 0 };' \ - $tmp > libraries/select_lang.lib.php - -# Final cleanup -rm -f $tmp +find po locale -type f $match -print0 | xargs -0r rm +# Delete empty directories +rmdir --ignore-fail-on-non-empty locale/*/* +rmdir --ignore-fail-on-non-empty locale/* hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, TESTING, updated. RELEASE_3_3_1RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, TESTING has been updated to ea408fe0eb5482fc238bf45dae53cbdaefd096ad (tag) from d6dd3af508764f700b5625cfe7b0ec1ea21ee72c (which is now obsolete) tagging 37f1bcf204b1d39053c34bb5a0b86fe8470d7ece (tag) length 178 bytes tagged by Michal Čihař on Fri Mar 12 13:39:21 2010 +0100 - Log ----------------------------------------------------------------- Retag testing. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, TESTING, updated. RELEASE_3_3_1RC1
by Michal Čihař 12 Mar '10

12 Mar '10

The annotated tag, TESTING has been updated to d6dd3af508764f700b5625cfe7b0ec1ea21ee72c (tag) from c5d58b76e50d90717a659f1c668870ce057134c8 (which is now obsolete) tagging 37f1bcf204b1d39053c34bb5a0b86fe8470d7ece (tag) length 178 bytes tagged by Michal Čihař on Fri Mar 12 13:33:02 2010 +0100 - Log ----------------------------------------------------------------- Retag testing. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0