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
34ca365b
Commit
34ca365b
authored
May 02, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use libtool --mode=execute when starting the mysqld as well.
Add $exe_libtool to be used throughout the script
parent
d0ed411f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+16
-3
No files found.
mysql-test/mysql-test-run.pl
View file @
34ca365b
...
@@ -189,6 +189,7 @@ our $exe_slave_mysqld;
...
@@ -189,6 +189,7 @@ our $exe_slave_mysqld;
our
$exe_im
;
our
$exe_im
;
our
$exe_my_print_defaults
;
our
$exe_my_print_defaults
;
our
$lib_udf_example
;
our
$lib_udf_example
;
our
$exe_libtool
;
our
$opt_bench
=
0
;
our
$opt_bench
=
0
;
our
$opt_small_bench
=
0
;
our
$opt_small_bench
=
0
;
...
@@ -448,6 +449,7 @@ sub initial_setup () {
...
@@ -448,6 +449,7 @@ sub initial_setup () {
{
{
$glob_use_libtool
=
0
;
$glob_use_libtool
=
0
;
}
}
$exe_libtool
=
"
../libtool
";
# We require that we are in the "mysql-test" directory
# We require that we are in the "mysql-test" directory
# to run mysql-test-run
# to run mysql-test-run
...
@@ -2624,6 +2626,15 @@ sub mysqld_start ($$$$$) {
...
@@ -2624,6 +2626,15 @@ sub mysqld_start ($$$$$) {
$exe
=
undef
;
$exe
=
undef
;
}
}
if
(
$glob_use_libtool
and
$opt_valgrind
)
{
# Add "libtool --mode-execute"
# if running in valgrind(to avoid valgrinding bash)
unshift
(
@$args
,
"
--mode=execute
",
$exe
);
$exe
=
$exe_libtool
;
}
if
(
$type
eq
'
master
'
)
if
(
$type
eq
'
master
'
)
{
{
if
(
!
defined
$exe
or
if
(
!
defined
$exe
or
...
@@ -3126,7 +3137,7 @@ sub run_mysqltest ($) {
...
@@ -3126,7 +3137,7 @@ sub run_mysqltest ($) {
# Add "libtool --mode-execute" before the test to execute
# Add "libtool --mode-execute" before the test to execute
# if running in valgrind(to avoid valgrinding bash)
# if running in valgrind(to avoid valgrinding bash)
unshift
(
@$args
,
"
--mode=execute
",
$exe
);
unshift
(
@$args
,
"
--mode=execute
",
$exe
);
$exe
=
"
libtool
"
;
$exe
=
$exe_libtool
;
}
}
if
(
$opt_check_testcases
)
if
(
$opt_check_testcases
)
...
@@ -3198,7 +3209,7 @@ sub gdb_arguments {
...
@@ -3198,7 +3209,7 @@ sub gdb_arguments {
if
(
$glob_use_libtool
)
if
(
$glob_use_libtool
)
{
{
mtr_add_arg
(
$$args
,
"
libtool
"
);
mtr_add_arg
(
$$args
,
$exe_libtool
);
mtr_add_arg
(
$$args
,
"
--mode=execute
");
mtr_add_arg
(
$$args
,
"
--mode=execute
");
}
}
...
@@ -3261,7 +3272,7 @@ sub ddd_arguments {
...
@@ -3261,7 +3272,7 @@ sub ddd_arguments {
$$args
=
[]
;
$$args
=
[]
;
if
(
$glob_use_libtool
)
if
(
$glob_use_libtool
)
{
{
$$exe
=
"
libtool
"
;
$$exe
=
$exe_libtool
;
mtr_add_arg
(
$$args
,
"
--mode=execute
");
mtr_add_arg
(
$$args
,
"
--mode=execute
");
mtr_add_arg
(
$$args
,
"
ddd
");
mtr_add_arg
(
$$args
,
"
ddd
");
}
}
...
@@ -3282,6 +3293,8 @@ sub debugger_arguments {
...
@@ -3282,6 +3293,8 @@ sub debugger_arguments {
my
$exe
=
shift
;
my
$exe
=
shift
;
my
$debugger
=
$opt_debugger
||
$opt_client_debugger
;
my
$debugger
=
$opt_debugger
||
$opt_client_debugger
;
# FIXME Need to change the below "eq"'s to
# "case unsensitive string contains"
if
(
$debugger
eq
"
vcexpress
"
or
$debugger
eq
"
vc
")
if
(
$debugger
eq
"
vcexpress
"
or
$debugger
eq
"
vc
")
{
{
# vc[express] /debugexe exe arg1 .. argn
# vc[express] /debugexe exe arg1 .. argn
...
...
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