Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f0a938f7832a06659a915e7d1e006a591ac0b781 https://github.com/phpmyadmin/phpmyadmin/commit/f0a938f7832a06659a915e7d1e00... Author: Mo Sureerat sureemo@gmail.com Date: 2022-10-09 (Sun, 10 October 2022) -03:00

Changed paths: M libraries/classes/FieldMetadata.php M libraries/classes/Util.php M test/classes/FieldMetadataTest.php M test/classes/UtilTest.php

Log Message: ----------- Fix issue - Edit/Copy/Delete row doesn't work when using GROUP BY (#17758)

* Fix issue - Edit/Copy/Delete row doesn't work when using GROUP BY

Root cause: GROUP_FLAG and NUM_FLAG have the same flags value 32768

Reference to https://www.php.net/manual/en/mysqli-result.fetch-fields.php

Fixes #17756

Signed-off-by: Mo Sureerat sureemo@gmail.com

Commit: d0215d3054e6f0d4f8cb4d072e39ff32d90b9f81 https://github.com/phpmyadmin/phpmyadmin/commit/d0215d3054e6f0d4f8cb4d072e39... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-10-09 (Sun, 10 October 2022) -03:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entries for #17747 and #17756

[ci skip]

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: ba02d77c534216ae6d571747c4bc5e4977caf6d6 https://github.com/phpmyadmin/phpmyadmin/commit/ba02d77c534216ae6d571747c4bc... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-10-09 (Sun, 10 October 2022) -03:00

Changed paths: M ChangeLog M libraries/classes/FieldMetadata.php M libraries/classes/Util.php M test/classes/FieldMetadataTest.php M test/classes/UtilTest.php

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

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev