Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a06c62ef044f0d14b5c9bd7b14aca115d76192c9 https://github.com/phpmyadmin/phpmyadmin/commit/a06c62ef044f0d14b5c9bd7b14ac... Author: William Desportes williamdes@wdes.fr Date: 2020-05-03 (Sun, 05 May 2020) +02:00

Changed paths: M import.php M libraries/classes/Sql.php

Log Message: ----------- Fix #16104 - Overwriting bookmarked query causes PHP Fatal error

Introduced-by: 3dce65d913cd95206038e8343ec63c1bbedd46ee Fixes: #16104 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 668a6614fd094668b12ae67e427e95ba020da12e https://github.com/phpmyadmin/phpmyadmin/commit/668a6614fd094668b12ae67e427e... Author: William Desportes williamdes@wdes.fr Date: 2020-05-03 (Sun, 05 May 2020) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add a ChangeLog entry for #16104

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: fd61e03ea657a0bd669695fc8dc72a6828347cb3 https://github.com/phpmyadmin/phpmyadmin/commit/fd61e03ea657a0bd669695fc8dc7... Author: William Desportes williamdes@wdes.fr Date: 2020-05-03 (Sun, 05 May 2020) +02:00

Changed paths: M ChangeLog M libraries/classes/Controllers/ImportController.php M libraries/classes/Sql.php

Log Message: ----------- Merge branch 'QA_5_0'

Signed-off-by: William Desportes williamdes@wdes.fr