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
5dbbb867
Commit
5dbbb867
authored
Dec 23, 2009
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restore flaky loadxml test, fix solaris plugin load using -lpthread instead of -lthread
parent
301f28c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
configure.cmake
configure.cmake
+7
-0
mysql-test/t/loadxml.test
mysql-test/t/loadxml.test
+0
-3
No files found.
configure.cmake
View file @
5dbbb867
...
@@ -284,6 +284,13 @@ IF(UNIX)
...
@@ -284,6 +284,13 @@ IF(UNIX)
ENDIF
()
ENDIF
()
FIND_PACKAGE
(
Threads
)
FIND_PACKAGE
(
Threads
)
IF
(
CMAKE_SYSTEM_NAME MATCHES
"SunOS"
)
# CMake defined -lthread as thread flag
# This crashes in dlopen when trying to load plugins
# Workaround with -lpthread
SET
(
CMAKE_THREADS_LIBS_INIT -lpthread
)
ENDIF
()
SET
(
CMAKE_REQUIRED_LIBRARIES
SET
(
CMAKE_REQUIRED_LIBRARIES
${
LIBM
}
${
LIBNSL
}
${
LIBBIND
}
${
LIBCRYPT
}
${
LIBSOCKET
}
${
LIBDL
}
${
CMAKE_THREAD_LIBS_INIT
}
${
LIBRT
}
)
${
LIBM
}
${
LIBNSL
}
${
LIBBIND
}
${
LIBCRYPT
}
${
LIBSOCKET
}
${
LIBDL
}
${
CMAKE_THREAD_LIBS_INIT
}
${
LIBRT
}
)
...
...
mysql-test/t/loadxml.test
View file @
5dbbb867
...
@@ -84,10 +84,7 @@ sleep 1;
...
@@ -84,10 +84,7 @@ sleep 1;
sleep 2;
sleep 2;
--enable_query_log
--enable_query_log
connection addconroot;
--reap
disconnect addconroot;
disconnect addconroot;
connection default;
#
#
# Clean up
# Clean up
...
...
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