Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-07-22 07:54:02 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-07-22 07:54:02 +0300
commit5cbebb36bab066e1d507d1490e7142102a0b174b (patch)
tree2b68b73e36ed1cb59993dec29fc855836d65042c
parentcd5154d74c8e49b0f777454716cf92972bcfb49c (diff)
parent36423d6ebd0a1d0ad28d1f1a0cde29a9315dcd43 (diff)
Merge branch 'QA_4_4'
Conflicts: ChangeLog README doc/conf.py libraries/Config.class.php
-rw-r--r--ChangeLog1
-rw-r--r--libraries/create_addfield.lib.php4
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be73faacbe..818051eb1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,7 @@ phpMyAdmin - ChangeLog
- bug #4984 Undefined <feature>work upon upgrade to new version
4.4.13.0 (not yet released)
+- issue #1808 "Improve table structure" generates invalid SQL
4.4.12.0 (2015-07-20)
- bug Saved chart image does not have a proper name or an extension
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
index 68e578cec3..afeaa29b76 100644
--- a/libraries/create_addfield.lib.php
+++ b/libraries/create_addfield.lib.php
@@ -106,6 +106,10 @@ function PMA_setColumnCreationStatementSuffix($current_field_num,
return $sql_suffix;
}
+ if ($_REQUEST['field_where'] == 'last') {
+ return $sql_suffix;
+ }
+
// Only the first field can be added somewhere other than at the end
if ($current_field_num == 0) {
if ($_REQUEST['field_where'] == 'first') {