gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-09-23 21:58:35 +02:00
commit 8813154557
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -12,6 +12,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

9
libraries/plugins/export/ExportSql.class.php
View File

@ -1662,13 +1662,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');
}