[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9ceb23: Don't append FROM clause for replacing in UNION st...

2016-10-12 Thread Deven Bansod 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ceb237dd6779e58047d112d051ab28b1002eb92
  
https://github.com/phpmyadmin/phpmyadmin/commit/9ceb237dd6779e58047d112d051ab28b1002eb92
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M tbl_export.php

  Log Message:
  ---
  Don't append FROM clause for replacing in UNION statements

If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 9ceb23: Don't append FROM clause for replacing in UNION st...

2016-10-12 Thread Deven Bansod 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9ceb237dd6779e58047d112d051ab28b1002eb92
  
https://github.com/phpmyadmin/phpmyadmin/commit/9ceb237dd6779e58047d112d051ab28b1002eb92
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M tbl_export.php

  Log Message:
  ---
  Don't append FROM clause for replacing in UNION statements

If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod 


  Commit: 0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  
https://github.com/phpmyadmin/phpmyadmin/commit/0de5f6099f60544bbd3e5d385f2b3e8072f0ccec
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12619

Signed-off-by: Deven Bansod 


  Commit: ff91dc93f4ad76d25a0bcc7628eeb9ce1f0757aa
  
https://github.com/phpmyadmin/phpmyadmin/commit/ff91dc93f4ad76d25a0bcc7628eeb9ce1f0757aa
  Author: Deven Bansod 
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
M ChangeLog
M tbl_export.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/48d599e99b28...ff91dc93f4ad___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git