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
cb7fe134
Commit
cb7fe134
authored
Feb 26, 2010
by
Dmitry Lenev
Browse files
Options
Browse Files
Download
Plain Diff
Merged recent changes from mysql-next-mr-bugfixing into
mysql-next-4284 tree.
parents
7fd30bf6
2f4e94d7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
13 deletions
+33
-13
cmake/dtrace.cmake
cmake/dtrace.cmake
+23
-2
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_semi_sync.test
+4
-0
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+6
-11
No files found.
cmake/dtrace.cmake
View file @
cb7fe134
...
@@ -72,8 +72,29 @@ IF(ENABLE_DTRACE)
...
@@ -72,8 +72,29 @@ IF(ENABLE_DTRACE)
)
)
ENDIF
()
ENDIF
()
IF
(
CMAKE_SYSTEM_NAME MATCHES
"SunOS"
AND CMAKE_COMPILER_IS_GNUCXX
AND CMAKE_SIZEOF_VOID_P EQUAL 4
)
IF
(
NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES
)
EXECUTE_PROCESS
(
COMMAND
${
CMAKE_C_COMPILER
}
${
CMAKE_C_COMPILER_ARG1
}
--version
OUTPUT_VARIABLE out
)
IF
(
out MATCHES
"3.4.6"
)
# This gcc causes crashes in dlopen() for dtraced shared libs,
# while standard shipped with Solaris10 3.4.3 is ok
SET
(
BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL
""
)
ELSE
()
SET
(
BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL
""
)
ENDIF
()
ENDIF
()
ENDIF
()
MACRO
(
DTRACE_INSTRUMENT target
)
FUNCTION
(
DTRACE_INSTRUMENT target
)
IF
(
BUGGY_GCC_NO_DTRACE_MODULES
)
GET_TARGET_PROPERTY
(
target_type
${
target
}
TYPE
)
IF
(
target_type MATCHES
"MODULE_LIBRARY"
)
RETURN
()
ENDIF
()
ENDIF
()
IF
(
ENABLE_DTRACE
)
IF
(
ENABLE_DTRACE
)
ADD_DEPENDENCIES
(
${
target
}
gen_dtrace_header
)
ADD_DEPENDENCIES
(
${
target
}
gen_dtrace_header
)
...
@@ -119,7 +140,7 @@ MACRO(DTRACE_INSTRUMENT target)
...
@@ -119,7 +140,7 @@ MACRO(DTRACE_INSTRUMENT target)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
END
MACRO
()
END
FUNCTION
()
# Ugly workaround for Solaris' DTrace inability to use probes
# Ugly workaround for Solaris' DTrace inability to use probes
...
...
mysql-test/suite/rpl/t/rpl_semi_sync.test
View file @
cb7fe134
...
@@ -3,6 +3,10 @@ source include/not_embedded.inc;
...
@@ -3,6 +3,10 @@ source include/not_embedded.inc;
source
include
/
have_innodb
.
inc
;
source
include
/
have_innodb
.
inc
;
source
include
/
master
-
slave
.
inc
;
source
include
/
master
-
slave
.
inc
;
# -- [DISABLED Bug#49557]
# This test case fails on Windows due to Bug#49557.
source
include
/
not_windows
.
inc
;
let
$engine_type
=
InnoDB
;
let
$engine_type
=
InnoDB
;
#let $engine_type= MyISAM;
#let $engine_type= MyISAM;
...
...
scripts/CMakeLists.txt
View file @
cb7fe134
...
@@ -105,7 +105,7 @@ IF(NOT FIND_PROC)
...
@@ -105,7 +105,7 @@ IF(NOT FIND_PROC)
EXECUTE_PROCESS
(
COMMAND ps -uaxww OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
)
EXECUTE_PROCESS
(
COMMAND ps -uaxww OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
)
IF
(
result MATCHES 0
)
IF
(
result MATCHES 0
)
SET
(
FIND_PROC
SET
(
FIND_PROC
"ps -uaxww | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep -- "
\
$MYSQLD\" | grep \" $PID \" > /dev/null
")
"ps -uaxww | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"
$MYSQLD
\"
| grep
\"
$PID
\"
> /dev/null"
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
...
@@ -113,20 +113,15 @@ IF(NOT FIND_PROC)
...
@@ -113,20 +113,15 @@ IF(NOT FIND_PROC)
# SysV style
# SysV style
EXECUTE_PROCESS
(
COMMAND ps -ef OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
)
EXECUTE_PROCESS
(
COMMAND ps -ef OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
)
IF
(
result MATCHES 0
)
IF
(
result MATCHES 0
)
SET( FIND_PROC "
ps -ef | grep -v \" grep\" | grep -v mysqld_safe | grep --
"
\
$
MYSQLD
\"
| grep
\"
$PID
\"
> /dev/null"
)
SET
(
FIND_PROC
"ps -ef | grep -v
\"
grep
\"
| grep -v mysqld_safe | grep --
\"
$MYSQLD
\"
| grep
\"
$PID
\"
> /dev/null"
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
()
EXECUTE_PROCESS
(
COMMAND sh -c
"kill -0 $$"
OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
2
)
EXECUTE_PROCESS
(
COMMAND sh -c
"kill -0 $$"
OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result
)
IF
(
result
3
MATCHES 0
)
IF
(
result MATCHES 0
)
SET
(
CHECK_PID
"kill -0 $PID > /dev/null 2> /dev/null"
)
SET
(
CHECK_PID
"kill -0 $PID > /dev/null 2> /dev/null"
)
ELSE
()
ELSE
()
EXECUTE_PROCESS
(
COMMAND sh -c
"kill -s 0 $$"
OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE result3
)
IF
(
result4 MATCHES 0
)
SET
(
CHECK_PID
"kill -s 0 $PID > /dev/null 2> /dev/null"
)
ELSE
()
SET
(
CHECK_PID
"kill -s SIGCONT $PID > /dev/null 2> /dev/null"
)
SET
(
CHECK_PID
"kill -s SIGCONT $PID > /dev/null 2> /dev/null"
)
ENDIF
()
ENDIF
()
ENDIF
()
ENDIF
(
UNIX
)
ENDIF
(
UNIX
)
...
...
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