[MDEV-4447] MariaDB sources should have unix-style line endings everywhere Created: 2013-04-27  Updated: 2015-06-03  Resolved: 2015-06-03

Status: Closed
Project: MariaDB Server
Component/s: OTHER
Affects Version/s: 10.0.2
Fix Version/s: 5.5.44, 10.0.20

Type: Bug Priority: Major
Reporter: Pavel Ivanov Assignee: Sergei Golubchik
Resolution: Fixed Votes: 0
Labels: None

Attachments: Text File connect_files.txt     Text File other_files.txt     Text File spider_files.txt     Text File tokudb_files.txt    
Sprint: 5.5.44

 Description   

Is it feasible to clean up all MariaDB sources and set unix-style line endings everywhere?
Currently running "grep -IUrl $'\r' *" reveals 68 files that have either Windows-style line endings or mixed-style line endings, about 10 of them are source files. I realize that many of those 68 are files used only on Windows, but I believe all modern tools on Windows work with unix-style line endings without problem. Meanwhile not having unix-style line endings everywhere doesn't allow to put MariaDB's tarball as-is into git repository when core.safecrlf is set to true in .gitconfig.

 Comments   
Comment by Vladislav Vaintroub [ 2013-04-30 ]

do you have your list handy?
The question is not only about modern tool, the question is about how easy would be to merge things once we start to make big changes without a good reason. Without being familiar with git - what bad things will happen if core.safecrlf is not set to true in .gitconfig?

Meanwhile, are you really sure you want to put the tarball as is to git repository? Tarball does not have history. And it could make lot of sense sense to have it, at least all people I know of who used git with MySQL/MariaDB sources converted from bzr, preserving history (Former Twitter folks, Antony Curtis, I believe Kristian too)

Comment by Vladislav Vaintroub [ 2013-04-30 ]

OTOH, mixed-style EOLs are ugly and are probably good to fix, if the diffs are not too big.

Comment by Pavel Ivanov [ 2013-04-30 ]

Attaching list of files.
As you said, even if setting core.safecrlf to false won't lead to any bad things it's still ugly to have repository with mixed EOLs (and actually some LOAD INFILE tests depend on windows-style EOLs, so you'll want to adjust them).

About putting tarball as is: I have concerns that I don't know how MariaDB's bzr history with lots of merges between different branches will be shown in git history after conversion and whether it's possible to convert all that history at all. And I'm not sure if we actually want to see all that history in our repo. That said following closely upstream development is kind of a new thing for us, so we don't know yet what we really need in this area. Getting tarball as-is is good enough for us atm.

Comment by Sergei Golubchik [ 2013-05-01 ]

although the issue applies to all MariaDB versions, we'll only fix it in 10.0 tree. In earlier trees this might make merges much more difficult.

Comment by Pavel Ivanov [ 2013-11-10 ]

And now MariaDB has spider and tokudb storage engines which have Windows line endings all over the place. This is really not nice.

Comment by Sergei Golubchik [ 2013-11-11 ]

Right. We'll fix MariaDB sources, but I don't think we'll touch spider and tokudb, otherwise they won't merge anymore

Comment by Tim Callaghan (Inactive) [ 2013-11-11 ]

@Pavel, can you please elaborate on the number of TokuDB source files that have Windows line endings? That's helpful in figuring out what we can do and when.

Comment by Pavel Ivanov [ 2013-11-12 ]

Attaching list of files that have Windows line endings in 10.0.5 tarball. TokuDB, Spider and CONNECT are separated as the most notable offenders (although after close examination it turns out that Spider truly stands above all).

Comment by Tim Callaghan (Inactive) [ 2013-11-12 ]

OK, since the TokuDB files are few and only test related it's not a big deal for us to fix this. I assume spider, connect, and "other" do not belong to Tokutek and will be fixed by someone else.

Comment by Colin Charles [ 2013-11-12 ]

tmcallaghan already contacted Kentoku Shiba (Spider) and I'll make sure CONNECT gets fixed too

Comment by Colin Charles [ 2013-11-16 ]

Kentoku has fixed this for spider - https://code.launchpad.net/~kentokushiba/maria/10.0.5-spider-3.1

Comment by Tim Callaghan (Inactive) [ 2013-12-16 ]

Two tickets created for TokuDB:
http://github.com/Tokutek/ft-engine/issues/154
http://github.com/Tokutek/ft-index/issues/119

Comment by Rich Prohaska [ 2013-12-16 ]

tokudb files files in tokutek's github repo. see previous comment for the tokutek issues.

Comment by Sergei Golubchik [ 2014-02-27 ]

fixed everything besides Connect, TokuDB, Spider, and packaging/WiX files.
Engines' files will be merged in a due time.

Comment by Otto Kekäläinen [ 2015-05-08 ]

This issue seems to have surfaced again in 10.0.18? See https://lists.launchpad.net/maria-developers/msg08541.html

Comment by Otto Kekäläinen [ 2015-05-08 ]

This issue should not even be possible in git unless somebody on purpose disables the autocrlf setting in their local git? See https://help.github.com/articles/dealing-with-line-endings/

Comment by Otto Kekäläinen [ 2015-05-15 ]

Scan of current mariadb 10.0 head:

$ find . -not -type d -exec file "{}" ";" | grep CRLF
 
./storage/connect/mysql-test/connect/std_data/expenses.txt: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/boyswin.txt: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/emp.txt: ASCII text, with CRLF line terminators
 
./storage/federatedx/README.windows: ASCII text, with CRLF line terminators
 
./sql/message.rc: ASCII text, with CRLF line terminators
 
./sql/winservice.h: ASCII English text, with CRLF line terminators
 
./packaging/WiX/custom_ui.wxs: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/mysql_server.wxs.in: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/extra.wxs.in: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/CPackWixConfig.cmake: ASCII English text, with CRLF line terminators
 
./packaging/WiX/create_msi.cmake.in: ASCII English text, with CRLF line terminators
 
./mysql-test/r/loadxml.result: ASCII text, with CRLF, LF line terminators
 
./mysql-test/r/mysql_binary_mode.result: ASCII English text, with CRLF, LF line terminators
 
./mysql-test/r/perror-win.result: ASCII text, with CRLF, LF line terminators
 
./mysql-test/r/func_regexp_pcre.result: UTF-8 Unicode C++ program text, with CRLF, CR, LF line terminators
 
./mysql-test/std_data/loaddata7.dat: ASCII text, with CRLF line terminators
 
./pcre/testdata/greppatN4: ASCII text, with CRLF line terminators
 
./pcre/testdata/grepoutputN: ASCII text, with CRLF, CR, LF line terminators
 
./pcre/RunTest.bat: DOS batch file, ASCII text, with CRLF line terminators

..and 10.1 head:

$ find . -not -type d -exec file "{}" ";" | grep CRLF
 
./storage/connect/colblk.cpp: ASCII C program text, with CRLF line terminators
 
./storage/connect/tabsys.h: ASCII C program text, with CRLF line terminators
 
./storage/connect/json.h: ASCII C program text, with CRLF line terminators
 
./storage/connect/rcmsg.c: ASCII C program text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/upd.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/odbc_sqlite3.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mysql_grant.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/fmt.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/updelx2.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/bin.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/json.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mysql.test: ASCII C program text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/xml_mdev5261.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/occur.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/myconn.inc: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/part_file.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/alter.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/null.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/myconn_cleanup.inc: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mysql_discovery.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/alter_xml.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/part_table.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mysql_new.test: ASCII C program text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/xcol.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mul.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/pivot.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mysql_exec.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/datest.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/mrr.test: ASCII English text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/general.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/json_udf.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/tbl.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/json_udf.inc: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/t/updelx.test: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/expenses.txt: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/mulexp5.json: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/mulexp3.json: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/expense.json: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/sexe.csv: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/boyswin.txt: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/biblio.json: ISO-8859 text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/mulexp4.json: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/emp.txt: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/std_data/sitmat.csv: ASCII text, with CRLF line terminators
 
./storage/connect/mysql-test/connect/my.cnf: ASCII text, with CRLF line terminators
 
./storage/federatedx/README.windows: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/have_partition.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/direct_aggregate_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/direct_aggregate.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/have_trigger.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/spider3_fixes.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/t/spider3_fixes_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/hs_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_slave1_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/ha_init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle2/include/deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/have_partition.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/direct_aggregate_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/direct_aggregate.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/have_trigger.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/spider3_fixes.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/t/spider3_fixes_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/have_partition.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/direct_aggregate_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/direct_aggregate.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/have_trigger.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/spider3_fixes.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/t/spider3_fixes_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/hs_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/hs_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/init_slave1_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/ha_init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/bg/include/init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/have_partition.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/direct_aggregate_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/direct_aggregate.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/have_trigger.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/spider3_fixes.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/t/spider3_fixes_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/hs_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/hs_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/init_slave1_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/ha_init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/handler/include/init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/have_partition.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/direct_aggregate_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/direct_aggregate.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/have_trigger.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/spider3_fixes.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/t/spider3_fixes_part.test: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/hs_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/hs_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_slave1_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/ha_init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/oracle/include/deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/hs_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/hs_init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child2_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_deinit_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child2_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_slave1_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_engine.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child3_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/ha_init_child3_2.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child3_3.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/init_child2_1.inc: ASCII text, with CRLF line terminators
 
./storage/spider/mysql-test/spider/include/deinit_child3_2.inc: ASCII text, with CRLF line terminators
 
./sql/message.rc: ASCII text, with CRLF line terminators
 
./sql/winservice.h: ASCII English text, with CRLF line terminators
 
./packaging/WiX/custom_ui.wxs: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/mysql_server.wxs.in: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/extra.wxs.in: exported SGML document, ASCII text, with CRLF line terminators
 
./packaging/WiX/CPackWixConfig.cmake: ASCII English text, with CRLF line terminators
 
./packaging/WiX/create_msi.cmake.in: ASCII English text, with CRLF line terminators
 
./mysql-test/r/loadxml.result: ASCII text, with CRLF, LF line terminators
 
./mysql-test/r/mysql_binary_mode.result: ASCII English text, with CRLF, LF line terminators
 
./mysql-test/r/perror-win.result: ASCII text, with CRLF, LF line terminators
 
./mysql-test/r/func_regexp_pcre.result: UTF-8 Unicode C++ program text, with CRLF, CR, LF line terminators
 
./mysql-test/std_data/loaddata7.dat: ASCII text, with CRLF line terminators
 
./pcre/testdata/greppatN4: ASCII text, with CRLF line terminators
 
./pcre/testdata/grepoutputN: ASCII text, with CRLF, CR, LF line terminators
 
./pcre/RunTest.bat: DOS batch file, ASCII text, with CRLF line terminators

Comment by Sergei Golubchik [ 2015-05-15 ]

otto, CRLF changes weren't merged into 10.1 yet. As for 10.0, .result and stddata/ files might intentionally have CRLF endings or even might have mixed endings — think of them as of "almost binary" files, they aren't human-editable. They're explicitly exempt from the CRLF policy in .gitattributes. PCRE test data are not exempt, but I suppose the same logic applies to them — test data can be anything. Other files — I suppose then can be fixed.

Comment by Otto Kekäläinen [ 2015-05-15 ]

Opened pull requests at
https://github.com/MariaDB/server/pull/64
https://github.com/MariaDB/server/pull/65

serg OK, created pull requests with .result and std_data/ omitted.

Comment by Daniel Black [ 2015-05-17 ]

Managed to get though the merging mess creating by CRLF policy.

..
[ 24%] Built target ps
[ 24%] Built target mysql_tzinfo_to_sql
[ 25%] Built target t
Linking CXX executable comp_err
[ 25%] Built target comp_err
[ 25%] Generating ../include/mysqld_error.h.tmp
Wrong input file format. Stop!
Line:

Failed to parse input file /home/dan/software_projects/mariadb-server/sql/share/errmsg-utf8.txt

https://github.com/MariaDB/server/pull/68 - allows the error files to contain \r as seems to be allowed now.

Comment by Daniel Black [ 2015-05-17 ]

mysql-test $ ./mtr qc_info
bash: ./mtr: /usr/bin/perl^M: bad interpreter: No such file or directory

workaround:

mysql-test $ perl ./mtr qc_info
Logging: ./mtr qc_info
vardir: /home/dan/software_projects/mariadb-server/mysql-test/var
Checking leftover processes...
Removing old var directory...
Creating var directory '/home/dan/software_projects/mariadb-server/mysql-test/var'...
Checking supported features...
MariaDB Version 10.1.5-MariaDB-wsrep-debug

  • SSL connections supported
  • binaries are debug compiled
    Collecting tests...
    Installing system database...
    mysql-test-run: *** ERROR: Error executing mysqld --bootstrap
    Could not install system database from /home/dan/software_projects/mariadb-server/mysql-test/var/tmp/bootstrap.sql
    The /home/dan/software_projects/mariadb-server/mysql-test/var/log/bootstrap.log file contains:
    /home/dan/software_projects/mariadb-server/sql/mysqld --no-defaults --bootstrap --basedir=/home/dan/software_projects/mariadb-server --datadir=/home/dan/software_projects/mariadb-server/mysql-test/var/install.db --default-storage-engine=myisam --skip-plugin-aria --skip-plugin-feedback --skip-plugin-innodb --skip-plugin-innodb-buffer-page --skip-plugin-innodb-buffer-page-lru --skip-plugin-innodb-buffer-pool-stats --skip-plugin-innodb-changed-pages --skip-plugin-innodb-cmp --skip-plugin-innodb-cmp-per-index --skip-plugin-innodb-cmp-per-index-reset --skip-plugin-innodb-cmp-reset --skip-plugin-innodb-cmpmem --skip-plugin-innodb-cmpmem-reset --skip-plugin-innodb-ft-being-deleted --skip-plugin-innodb-ft-config --skip-plugin-innodb-ft-default-stopword --skip-plugin-innodb-ft-deleted --skip-plugin-innodb-ft-index-cache --skip-plugin-innodb-ft-index-table --skip-plugin-innodb-lock-waits --skip-plugin-innodb-locks --skip-plugin-innodb-metrics --skip-plugin-innodb-mutexes --skip-plugin-innodb-sys-columns --skip-plugin-innodb-sys-datafiles --skip-plugin-innodb-sys-fields --skip-plugin-innodb-sys-foreign --skip-plugin-innodb-sys-foreign-cols --skip-plugin-innodb-sys-indexes --skip-plugin-innodb-sys-semaphore-waits --skip-plugin-innodb-sys-tables --skip-plugin-innodb-sys-tablespaces --skip-plugin-innodb-sys-tablestats --skip-plugin-innodb-tablespaces-encryption --skip-plugin-innodb-tablespaces-scrubbing --skip-plugin-innodb-trx --skip-plugin-partition --skip-plugin-xtradb-internal-hash-tables --skip-plugin-xtradb-read-view --skip-plugin-xtradb-rseg --loose-innodb --loose-innodb-log-file-size=5M --disable-sync-frm --tmpdir=/home/dan/software_projects/mariadb-server/mysql-test/var/tmp/ --core-file --lc-messages-dir=/home/dan/software_projects/mariadb-server/sql/share/ --character-sets-dir=/home/dan/software_projects/mariadb-server/sql/share/charsets
    150517 18:21:29 [Note] Plugin 'partition' is disabled.
    150517 18:21:29 [Note] Using unique option prefix 'plugin-innodb-cmp' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmp-per-index-enabled' instead.
    150517 18:21:29 [Note] Using unique option prefix 'plugin-innodb-cmp-per-index' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmp-per-index-enabled' instead.
    150517 18:21:29 [Note] Using unique option prefix 'plugin-innodb-locks' is error-prone and can break in the future. Please use the full name 'plugin-innodb-locks-unsafe-for-binlog' instead.
    150517 18:21:29 [Note] InnoDB: Using mutexes to ref count buffer pool pages
    2015-05-17 18:21:29 7f9706d718c0 InnoDB: !!!!!!!! UNIV_DEBUG switched on !!!!!!!!!
    2015-05-17 18:21:29 7f9706d718c0 InnoDB: !!!!!!!! UNIV_SYNC_DEBUG switched on !!!!!!!!!
    150517 18:21:29 [Note] InnoDB: The InnoDB memory heap is disabled
    150517 18:21:29 [Note] InnoDB: Mutexes and rw_locks use GCC atomic builtins
    150517 18:21:29 [Note] InnoDB: Memory barrier is not used
    150517 18:21:29 [Note] InnoDB: Compressed tables use zlib 1.2.8
    150517 18:21:29 [Note] InnoDB: Using Linux native AIO
    150517 18:21:29 [Note] InnoDB: Using CPU crc32 instructions
    150517 18:21:29 [Note] InnoDB: Initializing buffer pool, size = 128.0M
    150517 18:21:29 [Note] InnoDB: Completed initialization of buffer pool
    150517 18:21:29 [Note] InnoDB: The first specified data file ./ibdata1 did not exist: a new database to be created!
    150517 18:21:29 [Note] InnoDB: Setting file ./ibdata1 size to 12 MB
    150517 18:21:29 [Note] InnoDB: Database physically writes the file full: wait...
    150517 18:21:30 [Note] InnoDB: Setting log file ./ib_logfile101 size to 5 MB
    150517 18:21:30 [Note] InnoDB: Setting log file ./ib_logfile1 size to 5 MB
    150517 18:21:30 [Note] InnoDB: Renaming log file ./ib_logfile101 to ./ib_logfile0
    150517 18:21:30 [Warning] InnoDB: New log files created, LSN=45781
    150517 18:21:30 [Note] InnoDB: Doublewrite buffer not found: creating new
    150517 18:21:30 [Note] InnoDB: Doublewrite buffer created
    150517 18:21:30 [Note] InnoDB: 128 rollback segment(s) are active.
    150517 18:21:31 [Warning] InnoDB: Creating foreign key constraint system tables.
    150517 18:21:31 [Note] InnoDB: Foreign key constraint system tables created
    150517 18:21:31 [Note] InnoDB: Creating tablespace and datafile system tables.
    150517 18:21:31 [Note] InnoDB: Tablespace and datafile system tables created.
    150517 18:21:31 [Note] InnoDB: Waiting for purge to start
    150517 18:21:31 [Note] InnoDB: Percona XtraDB (http://www.percona.com) 5.6.22-72.0 started; log sequence number 0
    150517 18:21:31 [Note] Plugin 'Aria' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_DATAFILES' is disabled.
    150517 18:21:31 [Note] Using unique option prefix 'plugin-innodb-sys-tables' is error-prone and can break in the future. Please use the full name 'plugin-innodb-sys-tablestats' instead.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_TABLESTATS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_INDEXES' is disabled.
    150517 18:21:31 [Note] Plugin 'XTRADB_RSEG' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_TRX' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_DELETED' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_BEING_DELETED' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_LOCK_WAITS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_TABLESPACES_ENCRYPTION' is disabled.
    150517 18:21:31 [Note] Plugin 'XTRADB_INTERNAL_HASH_TABLES' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_FIELDS' is disabled.
    150517 18:21:31 [Note] Using unique option prefix 'plugin-innodb-cmpmem' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmpmem-reset' instead.
    150517 18:21:31 [Note] Plugin 'INNODB_CMPMEM_RESET' is disabled.
    150517 18:21:31 [Note] Plugin 'FEEDBACK' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_INDEX_TABLE' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_TABLESPACES' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_MUTEXES' is disabled.
    150517 18:21:31 [Note] Using unique option prefix 'plugin-innodb-buffer-page' is error-prone and can break in the future. Please use the full name 'plugin-innodb-buffer-page-lru' instead.
    150517 18:21:31 [Note] Plugin 'INNODB_BUFFER_PAGE_LRU' is disabled.
    150517 18:21:31 [Note] Using unique option prefix 'plugin-innodb-sys-foreign' is error-prone and can break in the future. Please use the full name 'plugin-innodb-sys-foreign-cols' instead.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_FOREIGN_COLS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_CMP_RESET' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_BUFFER_POOL_STATS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_INDEX_CACHE' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_METRICS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_DEFAULT_STOPWORD' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_COLUMNS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_FT_CONFIG' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_CMP_PER_INDEX_RESET' is disabled.
    150517 18:21:31 [Note] Plugin 'XTRADB_READ_VIEW' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_SYS_SEMAPHORE_WAITS' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_CHANGED_PAGES' is disabled.
    150517 18:21:31 [Note] Plugin 'INNODB_TABLESPACES_SCRUBBING' is disabled.
    150517 18:21:31 [Note] WSREP: Read nil XID from storage engines, skipping position init
    150517 18:21:31 [Note] WSREP: wsrep_load(): loading provider library 'none'
    CREATE DEFINER=root@localhost TRIGGERwedish_ci||nnection||||uery: '
    150517 18:21:33 [ERROR] Aborting

150517 18:21:33 [Note] WSREP: Service disconnected.
150517 18:21:34 [Note] WSREP: Some threads may fail to exit.
150517 18:21:34 [Note] InnoDB: FTS optimize thread exiting.
150517 18:21:34 [Note] InnoDB: Starting shutdown...
150517 18:21:35 [Note] InnoDB: Shutdown completed; log sequence number 1629612
150517 18:21:35 [Note] /home/dan/software_projects/mariadb-server/sql/mysqld: Shutdown complete

fix:

dos2unix ../mysql-test/include/mtr_warnings.sql
dos2unix: converting file ../mysql-test/include/mtr_warnings.sql to Unix format ...

next error:

mysql-test $ perl ./mtr qc_info
Logging: ./mtr qc_info
vardir: /home/dan/software_projects/mariadb-server/mysql-test/var
Checking leftover processes...
Removing old var directory...
Creating var directory '/home/dan/software_projects/mariadb-server/mysql-test/var'...
Checking supported features...
MariaDB Version 10.1.5-MariaDB-wsrep-debug

  • SSL connections supported
  • binaries are debug compiled
    Collecting tests...
    Installing system database...
    mysql-test-run: *** ERROR: Error executing mysqld --bootstrap
    Could not install system database from /home/dan/software_projects/mariadb-server/mysql-test/var/tmp/bootstrap.sql
    The /home/dan/software_projects/mariadb-server/mysql-test/var/log/bootstrap.log file contains:
    /home/dan/software_projects/mariadb-server/sql/mysqld --no-defaults --bootstrap --basedir=/home/dan/software_projects/mariadb-server --datadir=/home/dan/software_projects/mariadb-server/mysql-test/var/install.db --default-storage-engine=myisam --skip-plugin-aria --skip-plugin-feedback --skip-plugin-innodb --skip-plugin-innodb-buffer-page --skip-plugin-innodb-buffer-page-lru --skip-plugin-innodb-buffer-pool-stats --skip-plugin-innodb-changed-pages --skip-plugin-innodb-cmp --skip-plugin-innodb-cmp-per-index --skip-plugin-innodb-cmp-per-index-reset --skip-plugin-innodb-cmp-reset --skip-plugin-innodb-cmpmem --skip-plugin-innodb-cmpmem-reset --skip-plugin-innodb-ft-being-deleted --skip-plugin-innodb-ft-config --skip-plugin-innodb-ft-default-stopword --skip-plugin-innodb-ft-deleted --skip-plugin-innodb-ft-index-cache --skip-plugin-innodb-ft-index-table --skip-plugin-innodb-lock-waits --skip-plugin-innodb-locks --skip-plugin-innodb-metrics --skip-plugin-innodb-mutexes --skip-plugin-innodb-sys-columns --skip-plugin-innodb-sys-datafiles --skip-plugin-innodb-sys-fields --skip-plugin-innodb-sys-foreign --skip-plugin-innodb-sys-foreign-cols --skip-plugin-innodb-sys-indexes --skip-plugin-innodb-sys-semaphore-waits --skip-plugin-innodb-sys-tables --skip-plugin-innodb-sys-tablespaces --skip-plugin-innodb-sys-tablestats --skip-plugin-innodb-tablespaces-encryption --skip-plugin-innodb-tablespaces-scrubbing --skip-plugin-innodb-trx --skip-plugin-partition --skip-plugin-xtradb-internal-hash-tables --skip-plugin-xtradb-read-view --skip-plugin-xtradb-rseg --loose-innodb --loose-innodb-log-file-size=5M --disable-sync-frm --tmpdir=/home/dan/software_projects/mariadb-server/mysql-test/var/tmp/ --core-file --lc-messages-dir=/home/dan/software_projects/mariadb-server/sql/share/ --character-sets-dir=/home/dan/software_projects/mariadb-server/sql/share/charsets
    150517 18:23:28 [Note] Plugin 'partition' is disabled.
    150517 18:23:28 [Note] Using unique option prefix 'plugin-innodb-cmp' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmp-per-index-enabled' instead.
    150517 18:23:28 [Note] Using unique option prefix 'plugin-innodb-cmp-per-index' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmp-per-index-enabled' instead.
    150517 18:23:28 [Note] Using unique option prefix 'plugin-innodb-locks' is error-prone and can break in the future. Please use the full name 'plugin-innodb-locks-unsafe-for-binlog' instead.
    150517 18:23:28 [Note] InnoDB: Using mutexes to ref count buffer pool pages
    2015-05-17 18:23:28 7fd05e6748c0 InnoDB: !!!!!!!! UNIV_DEBUG switched on !!!!!!!!!
    2015-05-17 18:23:28 7fd05e6748c0 InnoDB: !!!!!!!! UNIV_SYNC_DEBUG switched on !!!!!!!!!
    150517 18:23:28 [Note] InnoDB: The InnoDB memory heap is disabled
    150517 18:23:28 [Note] InnoDB: Mutexes and rw_locks use GCC atomic builtins
    150517 18:23:28 [Note] InnoDB: Memory barrier is not used
    150517 18:23:28 [Note] InnoDB: Compressed tables use zlib 1.2.8
    150517 18:23:28 [Note] InnoDB: Using Linux native AIO
    150517 18:23:28 [Note] InnoDB: Using CPU crc32 instructions
    150517 18:23:28 [Note] InnoDB: Initializing buffer pool, size = 128.0M
    150517 18:23:28 [Note] InnoDB: Completed initialization of buffer pool
    150517 18:23:28 [Note] InnoDB: The first specified data file ./ibdata1 did not exist: a new database to be created!
    150517 18:23:28 [Note] InnoDB: Setting file ./ibdata1 size to 12 MB
    150517 18:23:28 [Note] InnoDB: Database physically writes the file full: wait...
    150517 18:23:28 [Note] InnoDB: Setting log file ./ib_logfile101 size to 5 MB
    150517 18:23:28 [Note] InnoDB: Setting log file ./ib_logfile1 size to 5 MB
    150517 18:23:29 [Note] InnoDB: Renaming log file ./ib_logfile101 to ./ib_logfile0
    150517 18:23:29 [Warning] InnoDB: New log files created, LSN=45781
    150517 18:23:29 [Note] InnoDB: Doublewrite buffer not found: creating new
    150517 18:23:29 [Note] InnoDB: Doublewrite buffer created
    150517 18:23:29 [Note] InnoDB: 128 rollback segment(s) are active.
    150517 18:23:29 [Warning] InnoDB: Creating foreign key constraint system tables.
    150517 18:23:30 [Note] InnoDB: Foreign key constraint system tables created
    150517 18:23:30 [Note] InnoDB: Creating tablespace and datafile system tables.
    150517 18:23:30 [Note] InnoDB: Tablespace and datafile system tables created.
    150517 18:23:30 [Note] InnoDB: Waiting for purge to start
    150517 18:23:30 [Note] InnoDB: Percona XtraDB (http://www.percona.com) 5.6.22-72.0 started; log sequence number 0
    150517 18:23:30 [Note] Plugin 'Aria' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_DATAFILES' is disabled.
    150517 18:23:30 [Note] Using unique option prefix 'plugin-innodb-sys-tables' is error-prone and can break in the future. Please use the full name 'plugin-innodb-sys-tablestats' instead.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_TABLESTATS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_INDEXES' is disabled.
    150517 18:23:30 [Note] Plugin 'XTRADB_RSEG' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_TRX' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_DELETED' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_BEING_DELETED' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_LOCK_WAITS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_TABLESPACES_ENCRYPTION' is disabled.
    150517 18:23:30 [Note] Plugin 'XTRADB_INTERNAL_HASH_TABLES' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_FIELDS' is disabled.
    150517 18:23:30 [Note] Using unique option prefix 'plugin-innodb-cmpmem' is error-prone and can break in the future. Please use the full name 'plugin-innodb-cmpmem-reset' instead.
    150517 18:23:30 [Note] Plugin 'INNODB_CMPMEM_RESET' is disabled.
    150517 18:23:30 [Note] Plugin 'FEEDBACK' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_INDEX_TABLE' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_TABLESPACES' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_MUTEXES' is disabled.
    150517 18:23:30 [Note] Using unique option prefix 'plugin-innodb-buffer-page' is error-prone and can break in the future. Please use the full name 'plugin-innodb-buffer-page-lru' instead.
    150517 18:23:30 [Note] Plugin 'INNODB_BUFFER_PAGE_LRU' is disabled.
    150517 18:23:30 [Note] Using unique option prefix 'plugin-innodb-sys-foreign' is error-prone and can break in the future. Please use the full name 'plugin-innodb-sys-foreign-cols' instead.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_FOREIGN_COLS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_CMP_RESET' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_BUFFER_POOL_STATS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_INDEX_CACHE' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_METRICS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_DEFAULT_STOPWORD' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_COLUMNS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_FT_CONFIG' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_CMP_PER_INDEX_RESET' is disabled.
    150517 18:23:30 [Note] Plugin 'XTRADB_READ_VIEW' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_SYS_SEMAPHORE_WAITS' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_CHANGED_PAGES' is disabled.
    150517 18:23:30 [Note] Plugin 'INNODB_TABLESPACES_SCRUBBING' is disabled.
    150517 18:23:30 [Note] WSREP: Read nil XID from storage engines, skipping position init
    150517 18:23:30 [Note] WSREP: wsrep_load(): loading provider library 'none'
    ORDED variable_name != 'GTID_BINLOG_STATE'AIO'odb_file_format_max')
    150517 18:23:33 [ERROR] Aborting

150517 18:23:33 [Note] WSREP: Service disconnected.
150517 18:23:34 [Note] WSREP: Some threads may fail to exit.
150517 18:23:34 [Note] InnoDB: FTS optimize thread exiting.
150517 18:23:34 [Note] InnoDB: Starting shutdown...
150517 18:23:36 [Note] InnoDB: Shutdown completed; log sequence number 1629612
150517 18:23:36 [Note] /home/dan/software_projects/mariadb-server/sql/mysqld: Shutdown complete

mysql-test $ dos2unix ../mysql-test/include/mtr_check.sql
dos2unix: converting file ../mysql-test/include/mtr_check.sql to Unix format ...

...

Comment by Otto Kekäläinen [ 2015-05-18 ]

danblack "https://github.com/MariaDB/server/pull/68 - allows the error files to contain \r as seems to be allowed now."

What do you mean? My pull request is about decreasing the amount or \r. The ultimate goal is not to have any of those if possible.

What are the logs about that you have posted here? I don't fully get the context.

Both now and previously if you run 'git checkout' on a Linux system the \r line endings are supposed to be stripped out of any non-binary files anyway due to git defaults, so you should not bump into them at all (https://help.github.com/articles/dealing-with-line-endings/).

Maybe all these problems we are seing since 10.0.17 is due to this commit https://github.com/MariaDB/server/commit/57aaccef52c22760450f02618213ec90ba0e873e where somebody changed the .gitattributes file which somehow made git on Linux systems to checkout some files with \r endings even though I guess the opposite was the intention..?

Comment by Daniel Black [ 2015-05-18 ]

I guess that's it, I couldn't work out the intention so I'll offer a PR and build fault showing the output text and leave it to those who understand the goals

git config --list
...
core.editor=vim
push.default=simple
merge.renamelimit=50000
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.autocrlf=true

core.autocrlf added in a hope to get a compliable source. Thanks for the link. That helped.

Comment by Tolleiv Nietsch [ 2015-05-20 ]

Hi,
in addition to PR 68 there seem to be a few other files which have the same issue. I've opened an additional PR ( https://github.com/MariaDB/server/pull/71 ) on top of PR 68.
Would be great to get these in
Cheers,
Tolleiv

Comment by Daniel Black [ 2015-06-01 ]

this is what a successful (sic) build looks like

$ uname -a
 
Linux spaceman 3.19.5-100.fc20.x86_64 #1 SMP Mon Apr 20 19:51:16 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux
 
$ git status
 
On branch 10.1
 
Your branch is up-to-date with 'origin/10.1'.
 
 
 
nothing to commit, working directory clean
 
$ cmake .   -DCMAKE_C_COMPILER=`which gcc` -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_MROONGA_STORAGE_ENGINE=ON -DWITHOUT_TOKUDB=ON -DWITHOUT_OQGRAPH=ON
 
$ make -j9
 
make[2]: *** [include/mysqld_error.h.tmp] Error 1
 
make[1]: *** [extra/CMakeFiles/GenError.dir/all] Error 2
 
make[1]: *** Waiting for unfinished jobs....
 
troff: fatal error: can't find macro file m
 
troff: fatal error: can't find macro file m
 
[ 25%] [ 25%] Built target t
 
Built target ps
 
[ 25%] Built target resolveip
 
Linking CXX executable mysql_tzinfo_to_sql
 
[ 25%] Built target mysql_tzinfo_to_sql
 
make: *** [all] Error 2
 
$ vi extra/comp_err.c
 
(edit as per github pr #68)
 
$ make -j 9
 
...
 
..
 
$ cd mysql-test/
 
$ ./mtr
 
bash: ./mtr: /usr/bin/perl^M: bad interpreter: No such file or directory
 
$ perl ./mtr
 
..
 
2015-06-01 13:01:18 140233271527616 [Note] WSREP: wsrep_load(): loading provider library 'none'
 
 CREATE DEFINER=root@localhost TRIGGERwedish_ci||nnection||||uery: '
 
2015-06-01 13:01:19 140233271527616 [ERROR] Aborting
 
$ dos2unix ../mysql-test/include/mtr_check.sql
 
$  perl ./mtr
 
..
 
..
 
2015-06-01 13:02:38 140230174668992 [Note] WSREP: wsrep_load(): loading provider library 'none'
 
 ) ENGINE=MyISAM|' at line 1ons ( your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '||
 
2015-06-01 13:02:40 140230174668992 [ERROR] Aborting
 
$ dos2unix ../mysql-test/include/mtr_warnings.sql
 
dos2unix: converting file ../mysql-test/include/mtr_warnings.sql to Unix format ...
 
$ perl ./mtr
 
...
 
..
 
plugins.pam                              [ skipped ]  No pam setup for mtr
 
federated.federated_partition 'X,innodb_plugin' [ pass ]    492
 
federated.federated_transactions 'X,innodb_plugin' [ pass ]    660
 
federated.federated_innodb 'X,innodb_plugin' [ pass ]    380
 
federated.federated_innodb 'innodb_plugin,old' [ pass ]    602
 
federated.federated_partition 'X,xtradb' [ pass ]    349
 
...
 
 
 
$ git stash
 
$ git checkout 5.5
 
$ cmake .   -DCMAKE_C_COMPILER=`which gcc` -DCMAKE_CXX_COMPILER=`which g++` -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_MROONGA_STORAGE_ENGINE=ON -DWITHOUT_TOKUDB=ON -DWITHOUT_OQGRAPH=ON-- The C compiler identification is GNU 4.8.3
 
-- The CXX compiler identification is GNU 4.8.3
 
-- Check for working C compiler: /usr/lib64/ccache/gcc
 
-- Check for working C compiler: /usr/lib64/ccache/gcc -- works
 
-- Detecting C compiler ABI info
 
-- Detecting C compiler ABI info - done
 
-- Check for working CXX compiler: /usr/lib64/ccache/g++
 
-- Check for working CXX compiler: /usr/lib64/ccache/g++ -- works
 
-- Detecting CXX compiler ABI info
 
-- Detecting CXX compiler ABI info - done
 
CMake Error at CMakeLists.txt:16 (INSTALL_MYSQL_TEST):
 
  Unknown CMake command "INSTALL_MYSQL_TEST".
 
 
 
 
 
CMake Warning (dev) in CMakeLists.txt:
 
  No cmake_minimum_required command is present.  A line of code such as
 
 
 
    cmake_minimum_required(VERSION 2.8)
 
 
 
  should be added at the top of the file.  The version specified may be lower
 
  if you wish to support older CMake versions for this project.  For more
 
  information run "cmake --help-policy CMP0000".
 
This warning is for project developers.  Use -Wno-dev to suppress it.
 
 
 
-- Configuring incomplete, errors occurred!
 
See also "/home/dan/software_projects/mariadb-server/mysql-test/CMakeFiles/CMakeOutput.log".
 
 

I think the number of hacks here to get this to compile are a failure of the foundation goal "Ensure sustainable high-quality efforts to build [and] test ..MariaDB."

Generated at Thu Feb 08 06:56:29 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.