bug 432091

This commit is contained in:
Marc Delisle
2001-06-12 13:17:34 +00:00
parent 78c82e80d8
commit f4316ecd40
22 changed files with 29 additions and 1 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-06-12 Marc Delisle <lem9@users.sourceforge.net>
* bug 432091: missing column in show processes
* add $strKill
2001-06-11 Marc Delisle <lem9@users.sourceforge.net> 2001-06-11 Marc Delisle <lem9@users.sourceforge.net>
* italian translation update by Alessandro Astarita * italian translation update by Alessandro Astarita
* german translation update by Kristof Hamann (korelstar) * german translation update by Kristof Hamann (korelstar)

View File

@@ -260,4 +260,5 @@ $strYes = "Sim";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Si";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ano";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ja";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ja";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Yes";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill="Kill";
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Oui";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill="Supprimer";
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ja";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = " Si ";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ja";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Tak";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Sim";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Si";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Ja";
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -260,4 +260,5 @@ $strYes = "Yes"; //to translate
// automatic generated by langxlorer.php (June 12, 2001, 12:29 pm) // automatic generated by langxlorer.php (June 12, 2001, 12:29 pm)
// V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de) // V0.1 - experimental (Steve Alberty - alberty@neptunlabs.de)
$strKill=" Kill "; //to translate
?> ?>

View File

@@ -297,6 +297,7 @@ function display_table ($dt_result, $is_simple = false) {
global $strTotal, $strEdit, $strPrevious, $strNext, $strDelete, $strDeleted; global $strTotal, $strEdit, $strPrevious, $strNext, $strDelete, $strDeleted;
global $strPos1, $strEnd, $sessionMaxRows, $strGo, $strShow, $strRowsFrom; global $strPos1, $strEnd, $sessionMaxRows, $strGo, $strShow, $strRowsFrom;
global $cfgModifyDeleteAtLeft, $cfgModifyDeleteAtRight; global $cfgModifyDeleteAtLeft, $cfgModifyDeleteAtRight;
global $strKill;
$cfgMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows; $cfgMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows;
$sessionMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows; $sessionMaxRows = isset($sessionMaxRows) ? $sessionMaxRows : $cfgMaxRows;
@@ -353,6 +354,9 @@ function display_table ($dt_result, $is_simple = false) {
if($cfgModifyDeleteAtLeft && !$is_simple) { if($cfgModifyDeleteAtLeft && !$is_simple) {
echo "<td></td><td></td>\n"; echo "<td></td><td></td>\n";
} }
if($sql_query == "SHOW PROCESSLIST") {
echo "<td></td>";
}
while($field = mysql_fetch_field($dt_result)) while($field = mysql_fetch_field($dt_result))
{ {
if(@mysql_num_rows($dt_result)>1 && !$is_simple) if(@mysql_num_rows($dt_result)>1 && !$is_simple)
@@ -441,7 +445,7 @@ function display_table ($dt_result, $is_simple = false) {
//end correction uva 19991216 pt. 3 ----------------------------- //end correction uva 19991216 pt. 3 -----------------------------
if($sql_query == "SHOW PROCESSLIST") if($sql_query == "SHOW PROCESSLIST")
echo "<td align=right><a href='sql.php3?db=mysql&sql_query=".urlencode("KILL $Id")."&goto=main.php3'>KILL</a></td>\n"; echo "<td align=right><a href='sql.php3?db=mysql&sql_query=".urlencode("KILL $Id")."&goto=main.php3'>$strKill</a></td>\n";
//possibility to have the modify/delete button on the left added //possibility to have the modify/delete button on the left added
// 2000-08-29 // 2000-08-29