Developers

developers@phpmyadmin.net

5 participants
7032 discussions

Re: [Phpmyadmin-devel] Re: [Patch] Parse error with 3.0.12

by Loïc

Hi again! Joshua I've commited your patch to the CVS tree. Could you test the script please ? Thanks, Loïc ______________________________________________________________________________ ifrance.com, l'email gratuit le plus complet de l'Internet ! vos emails depuis un navigateur, en POP3, sur Minitel, sur le WAP... http://www.ifrance.com/_reloc/email.emailif

22 years, 7 months

[Phpmyadmin-devel] Re: [PATCH] Better InnoDB info.

by Loïc

Hi Joshua and List! Thanks for your patch, Joshua. I've just commited it to the CVS tree :) Please all, it would be nice to fully test it now (more than I can do myself). Loïc ______________________________________________________________________________ ifrance.com, l'email gratuit le plus complet de l'Internet ! vos emails depuis un navigateur, en POP3, sur Minitel, sur le WAP... http://www.ifrance.com/_reloc/email.emailif

22 years, 7 months

[Phpmyadmin-devel] [PATCH] Better InnoDB info.

by Joshua Nye

This patch rewrites the handling of row count and table size in db_details to more accurately deal with different table types such as InnoDB. It also re-enables the valid fields of size usage and row stats in tbl_properties for InnoDB tables. -Josh diff -r -u phpMyAdmin-2.2.4/db_details.php phpMyAdmin-devel/db_details.php --- phpMyAdmin-2.2.4/db_details.php Tue Feb 19 18:35:40 2002 +++ phpMyAdmin-devel/db_details.php Thu Feb 21 12:00:00 2002 @@ -237,51 +237,43 @@ </td> <?php echo "\n"; - $mergetable = FALSE; - $nonisam = FALSE; - if (isset($sts_data['Type'])) { - if ($sts_data['Type'] == 'MRG_MyISAM') { - $mergetable = TRUE; - } else if (!eregi('ISAM|HEAP', $sts_data['Type'])) { - $nonisam = TRUE; + + if(isset($sts_data['Rows'])) { + # MyISAM, ISAM or Heap table: Row count, data size and index size is accurate. + if(isset($sts_data['Type']) && ereg('^(MyISAM|ISAM|HEAP)$', $sts_data['Type'])) { + $tblsize = $sts_data['Data_length'] + $sts_data['Index_length']; + $sum_size += $tblsize; + list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, $tblsize > 0 ? 1 : 0); + $sum_entries += $sts_data['Rows']; + $display_rows = number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator); } - } - if (isset($sts_data['Rows'])) { - if ($mergetable == FALSE) { - if ($cfgShowStats && $nonisam == FALSE) { - $tblsize = $sts_data['Data_length'] + $sts_data['Index_length']; - $sum_size += $tblsize; - if ($tblsize > 0) { - list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 1); - } else { - list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 0); - } - } else if ($cfgShowStats) { - $formated_size = ' - '; - $unit = ''; - } - $sum_entries += $sts_data['Rows']; + # InnoDB table: Row count is not accurate but data and index sizes are. + elseif(isset($sts_data['Type']) && $sts_data['Type'] == "InnoDB") { + $tblsize = $sts_data['Data_length'] + $sts_data['Index_length']; + $sum_size += $tblsize; + list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, $tblsize > 0 ? 1 : 0); + $display_rows = ' - '; } - // MyISAM MERGE Table - else if ($cfgShowStats && $mergetable == TRUE) { + + # Merge or BerkleyDB table: Only row count is accurate. + elseif(isset($sts_data['Type']) && ereg('^(MRG_MyISAM|BerkeleyDB)$', $sts_data['Type'])) { $formated_size = ' - '; - $unit = ''; + $unit = ''; + $sum_entries += $sts_data['Rows']; + $display_rows = number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator); } - else if ($cfgShowStats) { + + # Unknown table type. + else { $formated_size = 'unknown'; - $unit = ''; + $unit = ''; + $display_rows = 'unknown'; } + ?> <td align="right" bgcolor="<?php echo $bgcolor; ?>"> - <?php - echo "\n" . ' '; - if ($mergetable == TRUE) { - echo '' . number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . '' . "\n"; - } else { - echo number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; - } - ?> + <?php echo $display_rows . "\n"; ?> </td> <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">  <?php echo (isset($sts_data['Type']) ? $sts_data['Type'] : ' '); ?>  @@ -291,24 +283,21 @@ echo "\n"; ?> <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> -    - <a href="tbl_properties.php?<?php echo $url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a> +   <a href="tbl_properties.php?<?php echo $url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a> </td> <?php - echo "\n"; - } // end if - } else { + } + } + else { ?> - <td colspan="3" align="center" bgcolor="<?php echo $bgcolor; ?>"> - <?php echo $strInUse . "\n"; ?> - </td> +<td colspan="3" align="center" bgcolor="<?php echo $bgcolor; ?>"><?php echo $strInUse . "\n"; ?></td> <?php } echo "\n"; ?> </tr> <?php - } + } // Show Summary if ($cfgShowStats) { list($sum_formated, $unit) = PMA_formatByteDown($sum_size, 3, 1); diff -r -u phpMyAdmin-2.2.4/tbl_properties.php phpMyAdmin-devel/tbl_properties.php --- phpMyAdmin-2.2.4/tbl_properties.php Tue Feb 19 18:35:42 2002 +++ phpMyAdmin-devel/tbl_properties.php Thu Feb 21 11:58:15 2002 @@ -484,10 +484,11 @@ // BEGIN - Calc Table Space - staybyte - 9 June 2001 if ($cfgShowStats) { $nonisam = FALSE; + $innodb = $showtable['Type'] == "InnoDB"; if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) { $nonisam = TRUE; } - if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE) { + if (PMA_MYSQL_INT_VERSION >= 32303 && ($nonisam == FALSE || $innodb)) { // Gets some sizes $mergetable = FALSE; if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') { @@ -613,7 +614,7 @@ </tr> <?php } - if (isset($showtable['Rows'])) { + if (!$innodb && isset($showtable['Rows'])) { $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> @@ -625,7 +626,7 @@ </tr> <?php } - if (isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) { + if (!$innodb && isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) { $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?> @@ -637,7 +638,7 @@ </tr> <?php } - if (isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) { + if (!$innodb && isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) { $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); echo "\n"; ?>

22 years, 7 months

[Phpmyadmin-devel] [Patch] Parse error with 3.0.12

by Joshua Nye

Fixes a parse error with PHP 3. I'm using 3.0.12. Might happen in other versions. -Josh --- ../../phpMyAdmin-2.2.4/libraries/display_tbl.lib.php3 Sun Feb 10 04:29:50 2002 +++ display_tbl.lib.php3 Thu Feb 21 09:57:40 2002 @@ -662,7 +662,8 @@ * * @see PMA_displayTable() */ - function PMA_displayTableBody(&$dt_result, &$is_display, $map = array()) + + function PMA_displayTableBody($dt_result, $is_display, $map) { global $lang, $server, $db, $table; global $goto;

22 years, 7 months

[Phpmyadmin-devel] Re: [PATCH] Fix incorrect row count in db_details.php

by Joshua Nye

This removes from the total sum of rows the incorrect row counts from any tables that aren't ISAM/MyISAM/Heap. -Josh [root@lars htdocs]# diff -u phpMyAdmin/db_details.php phpMyAdmin-new/db_details.php --- phpMyAdmin/db_details.php Wed Feb 20 16:40:22 2002 +++ phpMyAdmin-new/db_details.php Thu Feb 21 08:09:55 2002 @@ -257,11 +257,11 @@ } else { list($formated_size, $unit) = PMA_formatByteDown($tblsize, 3, 0); } + $sum_entries += $sts_data['Rows']; } else if ($cfgShowStats) { $formated_size = ' - '; $unit = ''; } - $sum_entries += $sts_data['Rows']; } // MyISAM MERGE Table else if ($cfgShowStats && $mergetable == TRUE) { ----- Original Message ----- From: Joshua Nye To: phpmyadmin-devel(a)lists.sourceforge.net Sent: Wednesday, February 20, 2002 4:40 PM Subject: [PATCH] Fix incorrect row count in db_details.php I noticed that my row count displayed was incorrect for InnoDB tables as opposed to a SELECT COUNT(*). --Josh --- ../phpMyAdmin/db_details.php Tue Feb 19 18:35:40 2002 +++ db_details.php Wed Feb 20 16:37:13 2002 @@ -278,8 +278,10 @@ echo "\n" . ' '; if ($mergetable == TRUE) { echo '' . number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . '' . "\n"; - } else { + } elseif($nonisam == FALSE) { echo number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; + } else { + echo "-"; } ?> </td>

22 years, 7 months

[Phpmyadmin-devel] [PATCH] Fix incorrect row count in db_details.php

by Joshua Nye

I noticed that my row count displayed was incorrect for InnoDB tables as opposed to a SELECT COUNT(*). --Josh --- ../phpMyAdmin/db_details.php Tue Feb 19 18:35:40 2002 +++ db_details.php Wed Feb 20 16:37:13 2002 @@ -278,8 +278,10 @@ echo "\n" . ' '; if ($mergetable == TRUE) { echo '' . number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . '' . "\n"; - } else { + } elseif($nonisam == FALSE) { echo number_format($sts_data['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; + } else { + echo "-"; } ?> </td>

22 years, 7 months

[Phpmyadmin-devel] SQL Validation

by Robin Johnson

Hi Guys, 2.2.4 looks good. I'm still trying to figure out that one weird bug, but I think it is because I haven't sync'd against the master CVS in quite a while (due to the new stuff I was working on). I don't know if you saw this (http://developer.mimer.com/validator/index.htm) on Slashdot or not, but I have contacted them to see if there is some way we could include such a device in PMA, as I think it would help a lot. -- Robin Hugh Johnson E-Mail : robbat2(a)orbis-terrarum.net Home Page : http://www.orbis-terrarum.net/?l=people.robbat2 ICQ# : 30269588 or 41961639

22 years, 7 months

[Phpmyadmin-devel] phpMyAdmin 2.2.4 is released

by Marc Delisle

The development team is pleased to introduce this new version! As usual, downloading details are at http://phpmyadmin.sourceforge.net Marc, for the team. ---------------------------------------------- Main changes/improvements for version 2.2.4: Some improvements: * better support for cookies with multiple domains * new feature: mark row (on some browsers) * optional recall of previous login in cookie mode * optional disable of the Function column * can now optimize many tables in one operation * new "light" left frame: load only the table names for the current database (previous mode still available with a config. option) * in the tables list, do not display Browse, Select, Empty links if no data * some languages were updated. * documentation updates * new languages: hungarian, ukrainian, hebrew Some fixes: * do a manual Select against a table different for the one displayed, and you could not edit the results. * open_basedir restriction * some undefined variables * problem with Mozilla 0.9.7 * problem when someone forgets to uncheck the null checkbox * Query by example returned unlimited rows * wrong calculation for overhead in multiple tables printview * wrong page back after edit * error with the cookies on the login page * problem with https * could not revoke some user permissions

22 years, 7 months

[Phpmyadmin-devel] Re: Ready for 2.2.4?

by loic-div＠ifrance.com

Hi List! Marc wrote: >Well, I am :) So do I. Loïc ______________________________________________________________________________ ifrance.com, l'email gratuit le plus complet de l'Internet ! vos emails depuis un navigateur, en POP3, sur Minitel, sur le WAP... http://www.ifrance.com/_reloc/email.emailif

22 years, 7 months

[Phpmyadmin-devel] japanese lang to 2 encoding files

by luc

Hi list. I ask you to divide japanese language to two charset encoding files. lang/japanese-euc.inc.php3 lang/japanese-sjis.inc.php3 I attach these binary files and the patch including last stripslashes problem in common.lib.php3. diff -rc phpMyAdmin-cvs/libraries/common.lib.php3 phpMyAdmin/libraries/common.lib.php3 *** phpMyAdmin-cvs/libraries/common.lib.php3 Sun Feb 10 19:57:23 2002 --- phpMyAdmin/libraries/common.lib.php3 Tue Feb 19 22:36:11 2002 *************** *** 845,851 **** <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <?php echo stripslashes($message); ?> </td> </tr> <?php --- 845,851 ---- <table border="<?php echo $GLOBALS['cfgBorder']; ?>" cellpadding="5"> <tr> <td bgcolor="<?php echo $GLOBALS['cfgThBgcolor']; ?>"> ! <?php echo get_magic_quotes_gpc() ? stripslashes($message) : $message; ?> </td> </tr> <?php diff -rc phpMyAdmin-cvs/libraries/select_lang.lib.php3 phpMyAdmin/libraries/select_lang.lib.php3 *** phpMyAdmin-cvs/libraries/select_lang.lib.php3 Mon Feb 18 22:43:45 2002 --- phpMyAdmin/libraries/select_lang.lib.php3 Tue Feb 19 22:09:59 2002 *************** *** 58,64 **** 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese', 'japanese', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'), --- 58,65 ---- 'he' => array('he|hebrew', 'hebrew', 'he'), 'hu' => array('hu|hungarian', 'hungarian', 'hu'), 'it' => array('it|italian', 'italian', 'it'), ! 'ja' => array('ja|japanese-euc', 'japanese-euc', 'ja'), ! 'ja-sjis' => array('ja|japanese-sjis', 'japanese-sjis', 'ja'), 'ko' => array('ko|korean', 'korean', 'ko'), 'nl' => array('nl([-_][[:alpha:]]{2})?|dutch', 'dutch', 'nl'), 'no' => array('no|norwegian', 'norwegian', 'no'),

22 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

Developers