Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ded87e3301fac2294df9886c929f7d9c7fc296d8 https://github.com/phpmyadmin/phpmyadmin/commit/ded87e3301fac2294df9886c929f... Author: William Desportes williamdes@wdes.fr Date: 2025-01-16 (Thu, 01 January 2025) +01:00

Changed paths: M libraries/classes/Import.php M test/classes/Plugins/Import/ImportCsvTest.php M test/classes/Plugins/Import/ImportOdsTest.php

Log Message: ----------- Fix #16936 - Do not specify the collation when creating tables for imported data

Backport of https://github.com/phpmyadmin/phpmyadmin/pull/19035

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

Commit: 95b4be7d611e14e6651643e4c0ae21e49132e8a7 https://github.com/phpmyadmin/phpmyadmin/commit/95b4be7d611e14e6651643e4c0ae... Author: William Desportes williamdes@wdes.fr Date: 2025-01-16 (Thu, 01 January 2025) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add a CHANGELOG entry for #16936

Pull-request: #19035

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

Commit: b69d023e7491c8f3f4d990f5f9338452e8188180 https://github.com/phpmyadmin/phpmyadmin/commit/b69d023e7491c8f3f4d990f5f933... Author: William Desportes williamdes@wdes.fr Date: 2025-01-16 (Thu, 01 January 2025) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_5_2'

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