Details
-
Bug
-
Status: Closed (View Workflow)
-
Major
-
Resolution: Fixed
-
10.0.2
-
None
-
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.
Attachments
Activity
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..?
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.
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
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."
workaround:
fix:
next error:
...