mirror of
https://github.com/MariaDB/server.git
synced 2025-11-10 23:02:54 +03:00
mysql-test/t/warnings.test: Fix merge conflict by changing warning code mysql-test/r/create.result: Fix merge conflict mysql-test/r/warnings.result: Fix merge conflict sql/share/english/errmsg.txt: Fix the merge conflict
1.7 KiB
1.7 KiB