From 238e00b5d93a7a8ead47ce197e33e746419e2890 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 2 Oct 2015 18:16:33 +0300 Subject: [PATCH 1/2] Fix #11531. Invalid SQL in table definition when exporting table. Cherry-picked udan11/sql-parser@e5b1cd830d2156127ba090d0d173e344db5fcfd1. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Components/OptionsArray.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index a7fbf41249..a68df8ec63 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -197,7 +197,7 @@ class OptionsArray extends Component } } elseif ($state === 1) { $state = 2; - if ($token->value === '=') { + if ($token->token === '=') { $ret->options[$lastOptionId]['equals'] = true; continue; } From 33f1fe5bd929ce8036f6d9c65201a595ed94a67d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 2 Oct 2015 13:26:03 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index cd006aa3a4..2071613cf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #11512 SQL editing window does not recognise 'OUTER' keyword in 'LEFT OUTER JOIN' - issue #11518 "NOT IN" clause not recognized (MySQL 5.6 and 5.7) - issue #11524 Yellow star does not change in database Structure after add/remove from favorites +- issue #11531 Invalid SQL in table definition when exporting table 4.5.0.2 (2015-09-25) - issue #11497 Incorrect indexes when exporting