Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at Tue Mar 22 10:52:04 CET 2011.
--------
--- phpMyAdmin/phpMyAdmin.changes 2011-02-24 15:23:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2011-03-21 16:53:58.000000000 +0100
@@ -1,0 +2,13 @@
+Sat Mar 19 19:17:57 UTC 2011 - chris@computersalat.de
+
+- update to 3.3.10
+ - patch sf#3147400 [structure] Aria table size printed as unknown,
+ thanks to erickoh75 - erickoh75
+ - patch sf#3150164 [structure] Ordering by size gives incorrect results,
+ thanks to Madhura Jayaratne - madhuracj
+ - bug sf#3153409 [core] 0 row(s) affected
+ - bug sf#3155842 [core] Edit relational page and page number
+ - [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10
+ - [lang] German update, thanks to jannicars@users.sourceforge.net.
+
+-------------------------------------------------------------------
@@ -50 +62,0 @@
-
@@ -253,0 +266,2 @@
+-------------------------------------------------------------------
+Sun Aug 16 06:13:35 UTC 2009 - javier@opensuse.org
@@ -255 +268,0 @@
-* Sun Aug 16 2009 javier@opensuse.org
@@ -281 +294,4 @@
-* Fri Jul 24 2009 javier@opensuse.org
+
+-------------------------------------------------------------------
+Fri Jul 24 15:51:24 UTC 2009 - javier@opensuse.org
+
@@ -283 +299,4 @@
-* Sun Jun 28 2009 javier@opensuse.org
+
+-------------------------------------------------------------------
+Sun Jun 28 04:17:23 UTC 2009 - javier@opensuse.org
+
@@ -285 +304,4 @@
-* Sun May 04 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Sun May 4 16:19:43 UTC 2008 - crrodriguez@suse.de
+
@@ -317 +339,4 @@
-* Mon Apr 07 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Mon Apr 7 11:27:24 UTC 2008 - crrodriguez@suse.de
+
@@ -319 +344,4 @@
-* Sat Mar 29 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Sat Mar 29 15:53:44 UTC 2008 - crrodriguez@suse.de
+
@@ -322 +350,4 @@
-* Mon Mar 10 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Mon Mar 10 04:13:27 UTC 2008 - crrodriguez@suse.de
+
@@ -324 +355,4 @@
-* Sat Mar 01 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Sat Mar 1 23:34:52 UTC 2008 - crrodriguez@suse.de
+
@@ -349 +383,4 @@
-* Sun Jan 13 2008 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Sun Jan 13 11:02:14 UTC 2008 - crrodriguez@suse.de
+
@@ -380 +417,4 @@
-* Wed Aug 22 2007 crrodriguez@suse.de
+
+-------------------------------------------------------------------
+Wed Aug 22 12:36:22 UTC 2007 - crrodriguez@suse.de
+
@@ -385 +425,4 @@
-* Mon Aug 06 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Mon Aug 6 21:59:16 UTC 2007 - anosek@suse.cz
+
@@ -387 +430,4 @@
-* Mon Jul 30 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Mon Jul 30 11:38:44 UTC 2007 - anosek@suse.cz
+
@@ -455 +501,4 @@
-* Wed Jul 25 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Wed Jul 25 14:31:02 UTC 2007 - anosek@suse.cz
+
@@ -469 +518,4 @@
-* Tue Jun 19 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Jun 19 03:39:00 UTC 2007 - anosek@suse.cz
+
@@ -497 +549,4 @@
-* Tue Jun 12 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Jun 12 21:48:10 UTC 2007 - anosek@suse.cz
+
@@ -516 +571,4 @@
-* Tue Jun 05 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Jun 5 00:56:30 UTC 2007 - anosek@suse.cz
+
@@ -519 +577,4 @@
-* Tue Apr 24 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Apr 24 08:46:01 UTC 2007 - anosek@suse.cz
+
@@ -522 +583,4 @@
-* Tue Mar 06 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Mar 6 16:34:13 UTC 2007 - anosek@suse.cz
+
@@ -526 +590,4 @@
-* Wed Feb 28 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Wed Feb 28 14:16:10 UTC 2007 - anosek@suse.cz
+
@@ -534 +601,4 @@
-* Wed Jan 17 2007 anosek@suse.cz
+
+-------------------------------------------------------------------
+Wed Jan 17 12:14:04 UTC 2007 - anosek@suse.cz
+
@@ -545 +615,4 @@
-* Sat Dec 02 2006 mmarek@suse.cz
+
+-------------------------------------------------------------------
+Sat Dec 2 21:16:07 UTC 2006 - mmarek@suse.cz
+
@@ -548 +621,4 @@
-* Thu Nov 23 2006 anosek@suse.cz
+
+-------------------------------------------------------------------
+Thu Nov 23 16:01:59 UTC 2006 - anosek@suse.cz
+
@@ -550 +626,4 @@
-* Wed Nov 08 2006 anosek@suse.cz
+
+-------------------------------------------------------------------
+Wed Nov 8 04:04:15 UTC 2006 - anosek@suse.cz
+
@@ -555 +634,4 @@
-* Tue Oct 17 2006 postadal@suse.cz
+
+-------------------------------------------------------------------
+Tue Oct 17 15:25:56 UTC 2006 - postadal@suse.cz
+
@@ -572 +654,4 @@
-* Thu Sep 21 2006 anosek@suse.cz
+
+-------------------------------------------------------------------
+Thu Sep 21 06:18:48 UTC 2006 - anosek@suse.cz
+
@@ -591 +676,4 @@
-* Wed Aug 23 2006 anosek@suse.cz
+
+-------------------------------------------------------------------
+Wed Aug 23 21:06:46 UTC 2006 - anosek@suse.cz
+
@@ -596 +684,4 @@
-* Tue Aug 15 2006 anosek@suse.cz
+
+-------------------------------------------------------------------
+Tue Aug 15 20:48:22 UTC 2006 - anosek@suse.cz
+
@@ -600 +691,4 @@
-* Thu Aug 03 2006 mskibbe@suse.de
+
+-------------------------------------------------------------------
+Thu Aug 3 18:53:02 UTC 2006 - mskibbe@suse.de
+
@@ -608 +702,4 @@
-* Thu Jun 01 2006 postadal@suse.cz
+
+-------------------------------------------------------------------
+Thu Jun 1 12:57:37 UTC 2006 - postadal@suse.cz
+
@@ -612 +709,4 @@
-* Tue May 02 2006 mmarek@suse.cz
+
+-------------------------------------------------------------------
+Tue May 2 17:32:14 UTC 2006 - mmarek@suse.cz
+
@@ -615 +715,4 @@
-* Thu Apr 20 2006 mmarek@suse.cz
+
++++ 299 more lines (skipped)
++++ between phpMyAdmin/phpMyAdmin.changes
++++ and /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes
calling whatdependson for head-i586
Old:
----
phpMyAdmin-3.3.9.2-all-languages.tar.bz2
New:
----
phpMyAdmin-3.3.10-all-languages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.v9ah7i/_old 2011-03-22 10:50:51.000000000 +0100
+++ /var/tmp/diff_new_pack.v9ah7i/_new 2011-03-22 10:50:51.000000000 +0100
@@ -34,7 +34,7 @@
%endif
Summary: Administration of MySQL over the web
-Version: 3.3.9.2
+Version: 3.3.10
Release: 1
License: GPLv2+
Group: Productivity/Networking/Web/Frontends
++++++ phpMyAdmin-3.3.9.2-all-languages.tar.bz2 -> phpMyAdmin-3.3.10-all-languages.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/ChangeLog new/phpMyAdmin-3.3.10-all-languages/ChangeLog
--- old/phpMyAdmin-3.3.9.2-all-languages/ChangeLog 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/ChangeLog 2011-03-19 13:00:19.000000000 +0100
@@ -5,6 +5,16 @@
$Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $
+3.3.10.0 (2011-03-19)
+- patch #3147400 [structure] Aria table size printed as unknown,
+ thanks to erickoh75 - erickoh75
+- patch #3150164 [structure] Ordering by size gives incorrect results,
+ thanks to Madhura Jayaratne - madhuracj
+- bug #3153409 [core] 0 row(s) affected
+- bug #3155842 [core] Edit relational page and page number
+- [security] Minor security fixes, see PMASA-2010-9 and PMASA-2010-10
+- [lang] German update, thanks to to jannicars@users.sourceforge.net.
+
3.3.9.2 (2011-02-11)
- [security] SQL injection, see PMASA-2011-2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/Documentation.html new/phpMyAdmin-3.3.10-all-languages/Documentation.html
--- old/phpMyAdmin-3.3.9.2-all-languages/Documentation.html 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/Documentation.html 2011-03-19 13:00:19.000000000 +0100
@@ -10,7 +10,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.9.2 - Documentation</title>
+ <title>phpMyAdmin 3.3.10 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -18,7 +18,7 @@
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
- 3.3.9.2
+ 3.3.10
Documentation
</h1>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/Documentation.txt new/phpMyAdmin-3.3.10-all-languages/Documentation.txt
--- old/phpMyAdmin-3.3.9.2-all-languages/Documentation.txt 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/Documentation.txt 2011-03-19 13:00:19.000000000 +0100
@@ -1,4 +1,4 @@
-phpMyAdmin 3.3.9.2 Documentation
+phpMyAdmin 3.3.10 Documentation
* Top
* Requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/README new/phpMyAdmin-3.3.10-all-languages/README
--- old/phpMyAdmin-3.3.9.2-all-languages/README 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/README 2011-03-19 13:00:19.000000000 +0100
@@ -5,8 +5,8 @@
A set of PHP-scripts to manage MySQL over the web.
- Version 3.3.9.2
- ---------------
+ Version 3.3.10
+ --------------
http://www.phpmyadmin.net/
Copyright (C) 1998-2000 Tobias Ratschiller
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.10 new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.10
--- old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.10 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.10 2011-03-19 13:00:19.000000000 +0100
@@ -0,0 +1 @@
+Sat Mar 19 12:00:19 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.9.2 new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.9.2
--- old/phpMyAdmin-3.3.9.2-all-languages/RELEASE-DATE-3.3.9.2 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/RELEASE-DATE-3.3.9.2 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Fri Feb 11 17:56:49 UTC 2011
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/db_structure.php new/phpMyAdmin-3.3.10-all-languages/db_structure.php
--- old/phpMyAdmin-3.3.9.2-all-languages/db_structure.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/db_structure.php 2011-03-19 13:00:19.000000000 +0100
@@ -199,6 +199,8 @@
case 'HEAP' :
case 'MEMORY' :
case 'ARCHIVE' :
+ case 'Aria' :
+ case 'Maria' :
if ($db_is_information_schema) {
$each_table['Rows'] = PMA_Table::countRecords($db,
$each_table['Name']);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/error.php new/phpMyAdmin-3.3.10-all-languages/error.php
--- old/phpMyAdmin-3.3.9.2-all-languages/error.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/error.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * phpMyAdmin fatal error display page
- *
- * @version $Id$
- * @package phpMyAdmin
- */
-
-/**
- * Input sanitizing.
- */
-require_once './libraries/sanitizing.lib.php';
-
-/* Get variables */
-if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) {
- $lang = htmlspecialchars($_REQUEST['lang']);
-} else {
- $lang = 'en';
-}
-
-if (! empty($_REQUEST['dir']) && is_string($_REQUEST['dir'])) {
- $dir = htmlspecialchars($_REQUEST['dir']);
-} else {
- $dir = 'ltr';
-}
-
-if (! empty($_REQUEST['type']) && is_string($_REQUEST['type'])) {
- $type = htmlspecialchars($_REQUEST['type']);
-} else {
- $type = 'error';
-}
-
-// force utf-8 to avoid XSS with crafted URL and utf-7 in charset parameter
-$charset = 'utf-8';
-
-header('Content-Type: text/html; charset=' . $charset);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
-<head>
- <link rel="icon" href="./favicon.ico" type="image/x-icon" />
- <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
- <title>phpMyAdmin</title>
- <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
- <style type="text/css">
- <!--
- html {
- padding: 0;
- margin: 0;
- }
- body {
- font-family: sans-serif;
- font-size: small;
- color: #000000;
- background-color: #F5F5F5;
- margin: 1em;
- }
- h1 {
- margin: 0;
- padding: 0.3em;
- font-size: 1.4em;
- font-weight: bold;
- color: #ffffff;
- background-color: #ff0000;
- }
- p {
- margin: 0;
- padding: 0.5em;
- border: 0.1em solid red;
- background-color: #ffeeee;
- }
- //-->
- </style>
-</head>
-<body>
-<h1>phpMyAdmin - <?php echo $type; ?></h1>
-<p><?php
-if (!empty($_REQUEST['error'])) {
- if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
- echo PMA_sanitize(stripslashes($_REQUEST['error']));
- } else {
- echo PMA_sanitize($_REQUEST['error']);
- }
-} else {
- echo 'No error message!';
-}
-?></p>
-</body>
-</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/lang/german-utf-8.inc.php new/phpMyAdmin-3.3.10-all-languages/lang/german-utf-8.inc.php
--- old/phpMyAdmin-3.3.9.2-all-languages/lang/german-utf-8.inc.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/lang/german-utf-8.inc.php 2011-03-19 13:00:19.000000000 +0100
@@ -60,6 +60,7 @@
$strAlterOrderBy = 'Tabelle sortieren nach';
$strAnalyze = 'Analysieren';
$strAnalyzeTable = 'Analysiere Tabelle';
+$strAndSmall = 'und';
$strAndThen = 'und dann';
$strAnd = 'und';
$strAngularLinks = 'Winklige Verbindung';
@@ -413,6 +414,7 @@
$strImportNoticePt3 = 'Zum Ändern der Einstellungen auf das entsprechende "Optionen" klicken';
$strImportNoticePt4 = 'Zum Ändern der Struktur auf das entsprechenden "Struktur" klicken';
$strImportODSCurrency = 'Währungen importieren ($5.00 zu 5.00)';
+$strImportODS = 'Öffne Dokument Tabelle';
$strImportODSPercents = 'Prozentwerte importieren (12.00% wird zu .12)';
$strImportProceedingFile = 'Bitte Geduld, die Datei wird abgearbeitet.';
$strImportSuccessfullyFinished = 'Der Import wurde erfolgreich abgeschlossen, %d Abfragen wurden ausgeführt.';
@@ -781,6 +783,8 @@
$strReplicationServernConfiguredMaster = 'Dieser Server ist als nicht Master in einem Replikations-Prozess konfiguriert. Möchten Sie ihn <a href="%s">konfigurieren</a>?';
$strReplicationShowConnectedSlavesNote = 'Nur Slaves, die mit der Option --report-host=host_name gestartet wurden, sind in dieser Liste sichtbar';
$strReplicationShowConnectedSlaves = 'Zeige verbundene Slaves';
+$strReplicationShowMasterStatus = 'Zeige Haupt Status';
+$strReplicationSkippingErrorWarn = 'Errror überspringen kann dazu führen, dass die Master- und Slave Server nicht mehr abgeglichen sind!';
$strReplicationSlaveConfiguration = 'Slave-Konfiguration';
$strReplicationSlaveConfigured = 'Dieser Server ist als Slave in eienem Replikations Prozess konfiguriert. Möchten Sie:';
$strReplicationSlaveErrorManagement = 'Fehlerbehandlung:';
@@ -796,6 +800,7 @@
$strReplicationSlave = 'Slave Replikation';
$strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread läuft nicht!';
$strReplicationSlaveSQLThread = 'Nur SQL Thread %s';
+$strReplicationStatusInfo = 'Dieser MySQL Server arbeitet als ein %s in <b>Replication</b> Prozess. Für weitere Informationen über den Replication Status auf dem Server, besuche bitte die <a href="#replication">Replication Abteilung</a>.';
$strReplicationStatus_master = 'Master-Status';
$strReplicationStatus = 'Replikations-Status';
$strReplicationStatus_slave = 'Slave-Status';
@@ -1016,6 +1021,7 @@
$strSetupImport_allow_interrupt_name = 'Teilweiser Import: Unterbrechung erlauben';
$strSetupImport_format_desc = 'Voreingestelltes Format. Bitte beachten, dass diese Liste vom Ort abhängt (Datenbank, Tabelle) und nur SQL immer verfügbar ist';
$strSetupImport_format_name = 'Dateiformat';
+$strSetupImport_skip_queries_desc = 'Anzahl von Einträgen (Abfragen) zum überspringen vom Start';
$strSetupImport_skip_queries_name = 'Teilimport: Überspringe Anfragen';
$strSetupInsecureConnectionMsg1 = 'Sie benutzen keine sichere Verbindung. Alle Daten (einschließlich sensitiver Information wie Passwörter) werden unverschlüsselt übertragen!';
$strSetupInsecureConnectionMsg2 = 'Falls Ihr Server HTTPS Anfragen akzeptiert, folgen Sie [a@%s]diesem Link[/a] um eine sichere Verbindung zu benutzen.';
@@ -1064,6 +1070,7 @@
$strSetupMaxTableList_name = 'Tabellen Maximum';
$strSetupMemoryLimit_desc = 'Anzahl der Bytes, welche ein Script zur Ausführung benötigen darf, z.B. [kbd]32M[/kbd] ([kbd]0[/kbd] für unbegrenzt)';
$strSetupMemoryLimit_name = 'Speicher Limit';
+$strSetupNavigationBarIconic_desc = 'Benutze nur Icons, nur Text oder beides';
$strSetupNavigationBarIconic_name = 'Navigationsleiste mit Icons';
$strSetupNewServer = 'Neuer Server';
$strSetupNoServers = 'Es sind keine Server konfiguriert';
@@ -1135,7 +1142,9 @@
$strSetupServers_LogoutURL_name = 'Logout URL';
$strSetupServers_nopassword_desc = 'Versuche ohne Passwort zu verbinden';
$strSetupServers_nopassword_name = 'Ohne Passwort verbinden';
+$strSetupServers_only_db_desc = 'Du kannst MySQL Platzhalter Symbole (% und _) benutzen, entferne sie falls du wörtliche Instanzen benutzen möchtest, z.B. nutze \'my\_db\' und nicht \'my_db\'';
$strSetupServers_only_db_name = 'Nur aufgelistete Datenbanken zeigen';
+$strSetupServers_password_desc = 'Lass dies leer falls nicht, benutze config auth';
$strSetupServers_password_name = 'Passwort für config Authentifikation';
$strSetupServers_pdf_pages_desc = 'Leer lassen für keine PDF Schema Unterstützung, Vorschlag: [kbd]pma_pdf_pages[/kbd]';
$strSetupServers_pdf_pages_name = 'PDF Pages Table';
@@ -1193,6 +1202,7 @@
$strSetupSQLQuery_Explain_name = 'SQL erklären';
$strSetupSQLQuery_Refresh_name = 'Aktualisieren';
$strSetupSQLQuery_ShowAsPHP_name = 'PHP-Code erzeugen';
+$strSetupSQLQuery_Validate_name = 'Validiere SQL';
$strSetupSuggestDBName_desc = 'Schlage (wenn möglich) einen Datenbank-Namen im "Create Database" Formular vor oder lasse das Textfeld leer';
$strSetupSuggestDBName_name = 'Schlage einen neuen Datenbank-Namen vor';
$strSetupTrue = 'Ja';
@@ -1392,6 +1402,7 @@
$strStrucExcelCSV = 'CSV-Daten für MS Excel';
$strStrucOnly = 'Nur Struktur';
$strStructPropose = 'Tabellenstruktur analysieren';
+$strStructureDiff = 'Struktur Unterschiede' ;
$strStructureForView = 'Struktur des Views';
$strStructureLC = 'Struktur';
$strStructure = 'Struktur';
@@ -1415,6 +1426,7 @@
$strTableAlreadyExists = 'Die Tabelle %s existiert bereits!';
$strTableAlterColumn = 'Spalte(n) ändern';
$strTableAlteredSuccessfully = 'Die Tabelle %1$s wurde erfolgreich geändert';
+$strTableAlterIndex = 'Ändere index(e)';
$strTableApplyIndex = 'Index/Indices anwenden';
$strTableComments = 'Tabellen-Kommentar';
$strTableDeleteRows = 'Möchten Sie alle vorhergehenden zeilen aus den Ziel-Tabellen löschen?';
@@ -1609,22 +1621,4 @@
$strZeroRemovesTheLimit = 'Der Wert 0 (null) entfernt die Beschränkung.';
$strZip = 'Zip-komprimiert';
-// To translate:
-$strAndSmall = 'and'; //to translate
-
-$strImportODS = 'Open Document Spreadsheet'; //to translate
-
-$strReplicationShowMasterStatus = 'Show master status'; //to translate
-$strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; //to translate
-$strReplicationStatusInfo = 'This MySQL server works as %s in <b>replication</b> process. For further information about replication status on the server, please visit the <a href="#replication">replication section</a>.'; //to translate
-
-$strSetupImport_skip_queries_desc = 'Number of records (queries) to skip from start'; //to translate
-$strSetupNavigationBarIconic_desc = 'Use only icons, only text or both'; //to translate
-$strSetupServers_only_db_desc = 'You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\''; //to translate
-$strSetupServers_password_desc = 'Leave empty if not using config auth'; //to translate
-$strSetupSQLQuery_Validate_name = 'Validate SQL'; //to translate
-$strStructureDiff = 'Structure Difference' ; //to translate
-
-$strTableAlterIndex = 'Alter index(s)'; //to translate
-
?>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/Config.class.php new/phpMyAdmin-3.3.10-all-languages/libraries/Config.class.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/Config.class.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/Config.class.php 2011-03-19 13:00:19.000000000 +0100
@@ -92,7 +92,7 @@
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.3.9.2');
+ $this->set('PMA_VERSION', '3.3.10');
/**
* @deprecated
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/common.inc.php new/phpMyAdmin-3.3.10-all-languages/libraries/common.inc.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/common.inc.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/common.inc.php 2011-03-19 13:00:19.000000000 +0100
@@ -325,7 +325,6 @@
'db_printview.php',
'db_search.php',
//'Documentation.html',
- //'error.php',
'export.php',
'import.php',
//'index.php',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/core.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/core.lib.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/core.lib.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/core.lib.php 2011-03-19 13:00:19.000000000 +0100
@@ -261,21 +261,18 @@
$error_message = strtr($error_message, array('<br />' => '[br]'));
// Displays the error message
- // (do not use & for parameters sent by header)
- $query_params = array(
- 'lang' => $GLOBALS['available_languages'][$GLOBALS['lang']][2],
- 'dir' => $GLOBALS['text_dir'],
- 'type' => $GLOBALS['strError'],
- 'error' => $error_message,
- );
- header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?'
- . http_build_query($query_params, null, '&'));
+ $lang = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
+ $dir = $GLOBALS['text_dir'];
+ $type = $GLOBALS['strError'];
+ $error = $error_message;
// on fatal errors it cannot hurt to always delete the current session
if (isset($GLOBALS['session_name']) && isset($_COOKIE[$GLOBALS['session_name']])) {
PMA_removeCookie($GLOBALS['session_name']);
}
+ require('./libraries/error.inc.php');
+
exit;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/database_interface.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/database_interface.lib.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/database_interface.lib.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/database_interface.lib.php 2011-03-19 13:00:19.000000000 +0100
@@ -79,8 +79,8 @@
/**
* Common Functions
*/
-function PMA_DBI_query($query, $link = null, $options = 0) {
- $res = PMA_DBI_try_query($query, $link, $options)
+function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) {
+ $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows)
or PMA_mysqlDie(PMA_DBI_getError($link), $query);
return $res;
}
@@ -367,8 +367,16 @@
} else {
// Prepare to sort by creating array of the selected sort
// value to pass to array_multisort
- foreach ($each_tables as $table_name => $table_data) {
- ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]);
+
+ // Size = Data_length + Index_length
+ if ($sort_by == 'Data_length') {
+ foreach ($each_tables as $table_name => $table_data) {
+ ${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']);
+ }
+ } else {
+ foreach ($each_tables as $table_name => $table_data) {
+ ${$sort_by}[$table_name] = strtolower($table_data[$sort_by]);
+ }
}
if ($sort_order == 'DESC') {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysql.dbi.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysql.dbi.lib.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-03-19 13:00:19.000000000 +0100
@@ -155,7 +155,7 @@
* @param integer $options
* @return mixed
*/
-function PMA_DBI_try_query($query, $link = null, $options = 0)
+function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true)
{
if (empty($link)) {
if (isset($GLOBALS['userlink'])) {
@@ -176,6 +176,10 @@
$r = mysql_query($query, $link);
}
+ if ($cache_affected_rows) {
+ $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false);
+ }
+
if ($GLOBALS['cfg']['DBG']['sql']) {
$time = microtime(true) - $time;
@@ -392,17 +396,24 @@
return false;
}
}
- //$insert_id = mysql_insert_id($link);
- // if the primary key is BIGINT we get an incorrect result
+ // If the primary key is BIGINT we get an incorrect result
// (sometimes negative, sometimes positive)
// and in the present function we don't know if the PK is BIGINT
// so better play safe and use LAST_INSERT_ID()
//
- // by the way, no problem with mysqli_insert_id()
return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link);
}
-function PMA_DBI_affected_rows($link = null)
+/**
+ * returns the number of rows affected by last query
+ *
+ * @uses $GLOBALS['userlink']
+ * @uses mysql_affected_rows()
+ * @param object mysql $link the mysql object
+ * @param boolean $get_from_cache
+ * @return string integer
+ */
+function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
{
if (empty($link)) {
if (isset($GLOBALS['userlink'])) {
@@ -411,7 +422,12 @@
return false;
}
}
- return mysql_affected_rows($link);
+
+ if ($get_from_cache) {
+ return $GLOBALS['cached_affected_rows'];
+ } else {
+ return mysql_affected_rows($link);
+ }
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysqli.dbi.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysqli.dbi.lib.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/dbi/mysqli.dbi.lib.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/dbi/mysqli.dbi.lib.php 2011-03-19 13:00:19.000000000 +0100
@@ -175,9 +175,10 @@
* @param string $query query to execute
* @param object mysqli $link mysqli object
* @param integer $options
+ * @param boolean $cache_affected_rows
* @return mixed true, false or result object
*/
-function PMA_DBI_try_query($query, $link = null, $options = 0)
+function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true)
{
if ($options == ($options | PMA_DBI_QUERY_STORE)) {
$method = MYSQLI_STORE_RESULT;
@@ -199,6 +200,11 @@
$time = microtime(true);
}
$r = mysqli_query($link, $query, $method);
+
+ if ($cache_affected_rows) {
+ $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false);
+ }
+
if ($GLOBALS['cfg']['DBG']['sql']) {
$time = microtime(true) - $time;
@@ -451,7 +457,13 @@
return false;
}
}
- return mysqli_insert_id($link);
+ // When no controluser is defined, using mysqli_insert_id($link)
+ // does not always return the last insert id due to a mixup with
+ // the tracking mechanism, but this works:
+ return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link);
+ // Curiously, this problem does not happen with the mysql extension but
+ // there is another problem with BIGINT primary keys so PMA_DBI_insert_id()
+ // in the mysql extension also uses this logic.
}
/**
@@ -460,9 +472,10 @@
* @uses $GLOBALS['userlink']
* @uses mysqli_affected_rows()
* @param object mysqli $link the mysqli object
+ * @param boolean $get_from_cache
* @return string integer
*/
-function PMA_DBI_affected_rows($link = null)
+function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
{
if (empty($link)) {
if (isset($GLOBALS['userlink'])) {
@@ -471,7 +484,11 @@
return false;
}
}
- return mysqli_affected_rows($link);
+ if ($get_from_cache) {
+ return $GLOBALS['cached_affected_rows'];
+ } else {
+ return mysqli_affected_rows($link);
+ }
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/error.inc.php new/phpMyAdmin-3.3.10-all-languages/libraries/error.inc.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/error.inc.php 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/error.inc.php 2011-03-19 13:00:19.000000000 +0100
@@ -0,0 +1,57 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * phpMyAdmin fatal error display page
+ *
+ * @package phpMyAdmin
+ */
+
+if (! defined('PHPMYADMIN')) {
+ exit;
+}
+
+header('Content-Type: text/html; charset=utf-8');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">
+<head>
+ <link rel="icon" href="./favicon.ico" type="image/x-icon" />
+ <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
+ <title>phpMyAdmin</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <style type="text/css">
+ <!--
+ html {
+ padding: 0;
+ margin: 0;
+ }
+ body {
+ font-family: sans-serif;
+ font-size: small;
+ color: #000000;
+ background-color: #F5F5F5;
+ margin: 1em;
+ }
+ h1 {
+ margin: 0;
+ padding: 0.3em;
+ font-size: 1.4em;
+ font-weight: bold;
+ color: #ffffff;
+ background-color: #ff0000;
+ }
+ p {
+ margin: 0;
+ padding: 0.5em;
+ border: 0.1em solid red;
+ background-color: #ffeeee;
+ }
+ //-->
+ </style>
+</head>
+<body>
+<h1>phpMyAdmin - <?php echo $error_header; ?></h1>
+<p><?php echo PMA_sanitize($error_message); ?></p>
+</body>
+</html>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/export/yaml.php new/phpMyAdmin-3.3.10-all-languages/libraries/export/yaml.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/export/yaml.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/export/yaml.php 2011-03-19 13:00:19.000000000 +0100
@@ -167,11 +167,8 @@
continue;
}
- $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.' ', $record[$i]);
- if (strstr($record[$i], $crlf))
- $record[$i] = '|-' . $crlf . ' '.$record[$i];
-
- $buffer .= ' ' . $column . ': ' . $record[$i] . $crlf;
+ $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
+ $buffer .= ' ' . $column . ': "' . $record[$i] . '"' . $crlf;
}
if (! PMA_exportOutputHandler($buffer)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/libraries/relation.lib.php new/phpMyAdmin-3.3.10-all-languages/libraries/relation.lib.php
--- old/phpMyAdmin-3.3.9.2-all-languages/libraries/relation.lib.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/libraries/relation.lib.php 2011-03-19 13:00:19.000000000 +0100
@@ -29,10 +29,16 @@
*/
function PMA_query_as_controluser($sql, $show_error = true, $options = 0)
{
+ // Avoid caching of the number of rows affected; for example, this function
+ // is called for tracking purposes but we want to display the correct number
+ // of rows affected by the original query, not by the query generated for
+ // tracking.
+ $cache_affected_rows = false;
+
if ($show_error) {
- $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options);
+ $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows);
} else {
- $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options);
+ $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows);
} // end if... else...
if ($result) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/phpinfo.php new/phpMyAdmin-3.3.10-all-languages/phpinfo.php
--- old/phpMyAdmin-3.3.9.2-all-languages/phpinfo.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/phpinfo.php 2011-03-19 13:00:19.000000000 +0100
@@ -7,10 +7,6 @@
*/
/**
- * @ignore
- */
-define('PMA_MINIMUM_COMMON', true);
-/**
* Gets core libraries and defines some variables
*/
require_once './libraries/common.inc.php';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/tbl_replace.php new/phpMyAdmin-3.3.10-all-languages/tbl_replace.php
--- old/phpMyAdmin-3.3.9.2-all-languages/tbl_replace.php 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/tbl_replace.php 2011-03-19 13:00:19.000000000 +0100
@@ -357,7 +357,7 @@
if (! $result) {
$error_messages[] = PMA_DBI_getError();
} else {
- // the following is a real assignment:
+ // The next line contains a real assignment, it's not a typo
if ($tmp = @PMA_DBI_affected_rows()) {
$total_affected_rows += $tmp;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.3.9.2-all-languages/translators.html new/phpMyAdmin-3.3.10-all-languages/translators.html
--- old/phpMyAdmin-3.3.9.2-all-languages/translators.html 2011-02-11 18:56:49.000000000 +0100
+++ new/phpMyAdmin-3.3.10-all-languages/translators.html 2011-03-19 13:00:19.000000000 +0100
@@ -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.9.2 - Official translators</title>
+ <title>phpMyAdmin 3.3.10 - 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.9.2
+ 3.3.10
official translators list
</h1>
</div>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org