Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ab589043
Commit
ab589043
authored
May 04, 2012
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FreeBSD test errors. Also link with libexecinfo on FreeBSD for stacktrace functionality.
parent
e3ffaed1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
1 deletion
+13
-1
cmake/os/FreeBSD.cmake
cmake/os/FreeBSD.cmake
+9
-0
mysql-test/t/func_crypt.test
mysql-test/t/func_crypt.test
+2
-0
mysql-test/t/func_math.test
mysql-test/t/func_math.test
+1
-0
mysys/CMakeLists.txt
mysys/CMakeLists.txt
+1
-1
No files found.
cmake/os/FreeBSD.cmake
View file @
ab589043
...
...
@@ -23,6 +23,15 @@
# The below was used for really old versions of FreeBSD, roughly: before 5.1.9
# ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
# Find libexecinfo (library that contains backtrace_symbols etc)
INCLUDE_DIRECTORIES
(
/usr/local/include
)
SET
(
CMAKE_REQUIRED_INCLUDES
${
CMAKE_REQUIRED_INCLUDES
}
/usr/local/include
)
SET
(
ENV{LIB}
"$ENV{LIB}:/usr/local/lib"
)
FIND_LIBRARY
(
EXECINFO NAMES execinfo
)
IF
(
EXECINFO
)
SET
(
LIBEXECINFO
${
EXECINFO
}
)
ENDIF
()
# Use atomic builtins
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR STREQUAL
"i386"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-march=i686"
)
...
...
mysql-test/t/func_crypt.test
View file @
ab589043
...
...
@@ -23,7 +23,9 @@ select old_password('');
select
password
(
'gabbagabbahey'
);
select
old_password
(
'idkfa'
);
select
length
(
password
(
'1'
));
--
replace_result
60
13
select
length
(
encrypt
(
'test'
));
--
replace_result
\$
2
a
\$
04
\
$aO
....................
ql
.
D6ROU4Byvysj72xrV1ZAkrMKS8I6
aaqPiZY5xR5l
.
select
encrypt
(
'test'
,
'aa'
);
select
old_password
(
NULL
);
select
password
(
NULL
);
...
...
mysql-test/t/func_math.test
View file @
ab589043
...
...
@@ -17,6 +17,7 @@ explain extended select round(5.5),round(-5.5);
select
round
(
5.64
,
1
),
round
(
5.64
,
2
),
round
(
5.64
,
-
1
),
round
(
5.64
,
-
2
);
select
abs
(
-
10
),
sign
(
-
5
),
sign
(
5
),
sign
(
0
);
explain
extended
select
abs
(
-
10
),
sign
(
-
5
),
sign
(
5
),
sign
(
0
);
--
replace_result
2.0000000000000004
2
select
log
(
exp
(
10
)),
exp
(
log
(
sqrt
(
10
))
*
2
),
log
(
-
1
),
log
(
NULL
),
log
(
1
,
1
),
log
(
3
,
9
),
log
(
-
1
,
2
),
log
(
NULL
,
2
);
explain
extended
select
log
(
exp
(
10
)),
exp
(
log
(
sqrt
(
10
))
*
2
),
log
(
-
1
),
log
(
NULL
),
log
(
1
,
1
),
log
(
3
,
9
),
log
(
-
1
,
2
),
log
(
NULL
,
2
);
select
ln
(
exp
(
10
)),
exp
(
ln
(
sqrt
(
10
))
*
2
),
ln
(
-
1
),
ln
(
0
),
ln
(
NULL
);
...
...
mysys/CMakeLists.txt
View file @
ab589043
...
...
@@ -67,7 +67,7 @@ ENDIF()
ADD_CONVENIENCE_LIBRARY
(
mysys
${
MYSYS_SOURCES
}
)
TARGET_LINK_LIBRARIES
(
mysys dbug strings
${
ZLIB_LIBRARY
}
${
LIBNSL
}
${
LIBM
}
${
LIBRT
}
${
LIBSOCKET
}
)
${
LIBNSL
}
${
LIBM
}
${
LIBRT
}
${
LIBSOCKET
}
${
LIBEXECINFO
}
)
DTRACE_INSTRUMENT
(
mysys
)
IF
(
HAVE_BFD_H
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment