maria-developers team mailing list archive

[Otto Kekäläinen <otto@xxxxxxxxx>]

While preparing the Debian updates I noticed git complaning:

The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in
storage/spider/mysql-test/spider/t/have_partition.inc.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in
storage/spider/mysql-test/spider/t/have_trigger.inc.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in
storage/spider/mysql-test/spider/t/spider3_fixes.test.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in
storage/spider/mysql-test/spider/t/spider3_fixes_part.test.

Turns out a lot of source files in this release has Windows line endings:

 mariadb-10.0/mysql-test/r/func_regexp_pcre.result
 mariadb-10.0/mysql-test/r/loadxml.result
 mariadb-10.0/mysql-test/r/mysql_binary_mode.result
 mariadb-10.0/mysql-test/r/perror-win.result
 mariadb-10.0/mysql-test/std_data/loaddata7.dat
 mariadb-10.0/mysql-test/std_data/loadxml2.dat
 mariadb-10.0/packaging/WiX/CPackWixConfig.cmake
 mariadb-10.0/packaging/WiX/create_msi.cmake.in
 mariadb-10.0/packaging/WiX/custom_ui.wxs
 mariadb-10.0/packaging/WiX/extra.wxs.in
 mariadb-10.0/packaging/WiX/mysql_server.wxs.in
 mariadb-10.0/pcre/RunTest.bat
 mariadb-10.0/pcre/testdata/greppatN4
 mariadb-10.0/sql/message.rc
 mariadb-10.0/sql/winservice.h
 mariadb-10.0/storage/connect/colblk.cpp
 mariadb-10.0/storage/connect/mysql-test/connect/my.cnf
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/biblio.json
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/bookstore.xml
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/boyswin.txt
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/emp.txt
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/expense.json
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/expenses.txt
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp3.json
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp4.json
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/mulexp5.json
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/sexe.csv
 mariadb-10.0/storage/connect/mysql-test/connect/std_data/sitmat.csv
 mariadb-10.0/storage/connect/mysql-test/connect/t/alter.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/alter_xml.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/bin.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/datest.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/fmt.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/general.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/json.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/json_udf.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mrr.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mul.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/myconn.inc
 mariadb-10.0/storage/connect/mysql-test/connect/t/myconn_cleanup.inc
 mariadb-10.0/storage/connect/mysql-test/connect/t/mysql.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_discovery.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_exec.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_grant.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/mysql_new.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/null.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/occur.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/odbc_sqlite3.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/part_file.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/part_table.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/pivot.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/tbl.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/unsigned.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/upd.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/updelx.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/updelx2.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/xcol.test
 mariadb-10.0/storage/connect/mysql-test/connect/t/xml_mdev5261.test
 mariadb-10.0/storage/connect/rcmsg.c
 mariadb-10.0/storage/connect/tabsys.h
 mariadb-10.0/storage/federatedx/README.windows
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/ha_init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/hs_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/hs_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/include/init_slave1_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/direct_aggregate.test
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/direct_aggregate_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/have_partition.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/have_trigger.inc
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/spider3_fixes.test
 mariadb-10.0/storage/spider/mysql-test/spider/bg/t/spider3_fixes_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/ha_init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/hs_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/hs_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/include/init_slave1_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/direct_aggregate.test
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/direct_aggregate_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/have_partition.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/have_trigger.inc
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/spider3_fixes.test
 mariadb-10.0/storage/spider/mysql-test/spider/handler/t/spider3_fixes_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/deinit_engine.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/ha_init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/hs_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/hs_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/include/init_slave1_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/ha_init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/hs_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/hs_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/include/init_slave1_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/direct_aggregate.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/direct_aggregate_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/have_partition.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/have_trigger.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/spider3_fixes.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle/t/spider3_fixes_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child2_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_2.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_child3_3.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/include/init_slave1_1.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/direct_aggregate.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/direct_aggregate_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/have_partition.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/have_trigger.inc
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/spider3_fixes.test
 mariadb-10.0/storage/spider/mysql-test/spider/oracle2/t/spider3_fixes_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/t/direct_aggregate.test
 mariadb-10.0/storage/spider/mysql-test/spider/t/direct_aggregate_part.test
 mariadb-10.0/storage/spider/mysql-test/spider/t/have_partition.inc
 mariadb-10.0/storage/spider/mysql-test/spider/t/have_trigger.inc
 mariadb-10.0/storage/spider/mysql-test/spider/t/spider3_fixes.test
 mariadb-10.0/storage/spider/mysql-test/spider/t/spider3_fixes_part.test
 mariadb-10.0/win/packaging/COPYING.rtf
 mariadb-10.0/win/packaging/CPackWixConfig.cmake
 mariadb-10.0/win/packaging/ca/CustomAction.cpp
 mariadb-10.0/win/packaging/custom_ui.wxs
 mariadb-10.0/win/packaging/extra.wxs.in
 mariadb-10.0/win/packaging/heidisql.cmake
 mariadb-10.0/win/packaging/heidisql.wxi.in
 mariadb-10.0/win/packaging/heidisql_feature.wxi.in
 mariadb-10.0/win/packaging/mysql_server.wxs.in
 mariadb-10.0/win/upgrade_wizard/stdafx.h
 mariadb-10.0/win/upgrade_wizard/targetver.h
 mariadb-10.0/win/upgrade_wizard/upgrade.cpp
 mariadb-10.0/win/upgrade_wizard/upgrade.h
 mariadb-10.0/win/upgrade_wizard/upgrade.rc
 mariadb-10.0/win/upgrade_wizard/upgradeDlg.h
 mariadb-10.0/win/upgrade_wizard/upgrade_wizard.exe.manifest

This is the first time in two years I've found CRLF line endings in
MariaDB source files. I hope I won't see them again..