|
Fix is pushed in 10.1.47.
10.2:
====
No merge conflicts. But following file changes are not required from 10.2 and higer versions.
Hence reverted it.
/mysql-test/r/ctype_cp932_binlog_stm.result
10.2: https://github.com/MariaDB/server/commit/af28b96e3d005d8d0cb99985ce61a78a7778aa20
10.3:
====
Clean merge from 10.2 to 10.3.
10.3: https://github.com/MariaDB/server/commit/edf45efe33f2aeaa01ff45eaeec832f841c0ace0
10.4:
====
https://github.com/MariaDB/server/commit/14ab041de76c8f74de222b21bc9951282bfe8898
10.5:
=====
https://github.com/MariaDB/server/commit/475de254a8591d5d8006570d914469e359de60cc
|