From 053edda33f5bd957726b8bc82167ec8d30e705bc Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Thu, 24 Sep 2015 00:22:58 +0530 Subject: [PATCH 1/2] Fix #11492, AUTO_INCREMENT statements are partly missing from exports Signed-off-by: Nisarg Jhaveri --- ChangeLog | 1 + libraries/plugins/export/ExportSql.class.php | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b286ebdb90..2cc2273703 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value - issue #11491 Propose table structure broken - issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system +- issue #11492 AUTO_INCREMENT statements are partly missing from exports 4.5.0.0 (2015-09-23) + rfe Pagination for GIS visualization diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 0993486e63..62e89b4e33 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1709,13 +1709,12 @@ class ExportSql extends ExportPlugin } // Generating auto-increment-related query. - if ((! empty($auto_increment)) - && ($update_indexes_increments) - && ($statement->entityOptions->has('AUTO_INCREMENT') !== false) - ) { + if ((! empty($auto_increment)) && ($update_indexes_increments)) { $sql_auto_increments_query = $alter_header . $crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment); - if (isset($GLOBALS['sql_auto_increment'])) { + if (isset($GLOBALS['sql_auto_increment']) + && ($statement->entityOptions->has('AUTO_INCREMENT') !== false) + ) { $sql_auto_increments_query .= ', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT'); } From 2b089a019adb31ae62147241c385b513f1dbc9c9 Mon Sep 17 00:00:00 2001 From: Victor Laureano Date: Wed, 23 Sep 2015 17:13:03 +0200 Subject: [PATCH 2/2] Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.4% (2966 of 3209 strings) [CI skip] --- po/pt_BR.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d73b30f0b..77c00bff7b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-08-03 23:39+0200\n" -"Last-Translator: Guilherme Seibt \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2015-09-23 17:13+0200\n" +"Last-Translator: Victor Laureano \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5\n" #: changelog.php:37 license.php:30 #, php-format @@ -653,7 +653,6 @@ msgstr "" "pma. Mais informações disponíveis em %s." #: index.php:163 -#, fuzzy #| msgid "General Settings" msgid "General settings" msgstr "Configurações gerais" @@ -669,10 +668,9 @@ msgid "Server connection collation" msgstr "Collation de conexão do servidor MySQL" #: index.php:229 -#, fuzzy #| msgid "Appearance Settings" msgid "Appearance settings" -msgstr "Configurações de aparência" +msgstr "Configurações do Tema" #: index.php:259 prefs_manage.php:285 msgid "More settings" @@ -961,12 +959,13 @@ msgid "" "Do you really want to DROP the selected partition(s)? This will also DELETE " "the data related to the selected partition(s)!" msgstr "" +"Você realmente quer APAGAR a(s) partição(ões) seleciona(s)? Isso também irá " +"DELETAR os dados relacionados com a(s) partição(ões) seleciona(s)!" #: js/messages.php:65 -#, fuzzy #| msgid "Do you really want to delete the search \"%s\"?" msgid "Do you really want to TRUNCATE the selected partition(s)?" -msgstr "Você realmente deseja excluir a busca \"%s\"?" +msgstr "Você realmente deseja LIMPAR a(s) partição(ões) seleciona(s)?" #: js/messages.php:67 msgid ""