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
e2671636
Commit
e2671636
authored
Nov 25, 2003
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysql-test-run fixes:
libexec support in install_test_db --start-from in mysql-test-run
parent
19845c6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
mysql-test/install_test_db.sh
mysql-test/install_test_db.sh
+9
-2
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+6
-0
No files found.
mysql-test/install_test_db.sh
View file @
e2671636
...
@@ -12,11 +12,13 @@ if [ x$1 = x"-bin" ]; then
...
@@ -12,11 +12,13 @@ if [ x$1 = x"-bin" ]; then
BINARY_DIST
=
1
BINARY_DIST
=
1
fix_bin
=
mysql-test
fix_bin
=
mysql-test
scriptdir
=
../bin
scriptdir
=
../bin
libexecdir
=
../libexec
else
else
execdir
=
../sql
execdir
=
../sql
bindir
=
../client
bindir
=
../client
fix_bin
=
.
fix_bin
=
.
scriptdir
=
../scripts
scriptdir
=
../scripts
libexecdir
=
../libexec
fi
fi
vardir
=
var
vardir
=
var
...
@@ -36,8 +38,13 @@ EXTRA_ARG=""
...
@@ -36,8 +38,13 @@ EXTRA_ARG=""
if
test
!
-x
$execdir
/mysqld
if
test
!
-x
$execdir
/mysqld
then
then
echo
"mysqld is missing - looked in
$execdir
"
if
test
!
-x
$libexecdir
/mysqld
exit
1
then
echo
"mysqld is missing - looked in
$execdir
and in
$libexecdir
"
exit
1
else
execdir
=
$libexecdir
fi
fi
fi
# On IRIX hostname is in /usr/bsd so add this to the path
# On IRIX hostname is in /usr/bsd so add this to the path
...
...
mysql-test/mysql-test-run.sh
View file @
e2671636
...
@@ -229,6 +229,7 @@ while test $# -gt 0; do
...
@@ -229,6 +229,7 @@ while test $# -gt 0; do
--local
)
USE_RUNNING_SERVER
=
""
;;
--local
)
USE_RUNNING_SERVER
=
""
;;
--extern
)
USE_RUNNING_SERVER
=
"1"
;;
--extern
)
USE_RUNNING_SERVER
=
"1"
;;
--tmpdir
=
*
)
MYSQL_TMP_DIR
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--tmpdir=;;"
`
;;
--tmpdir
=
*
)
MYSQL_TMP_DIR
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--tmpdir=;;"
`
;;
--start-from
=
*
)
START_FROM
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--start-from=;;"
`
;;
--local-master
)
--local-master
)
MASTER_MYPORT
=
3306
;
MASTER_MYPORT
=
3306
;
EXTRA_MYSQL_TEST_OPT
=
"
$EXTRA_MYSQL_TEST_OPT
--host=127.0.0.1
\
EXTRA_MYSQL_TEST_OPT
=
"
$EXTRA_MYSQL_TEST_OPT
--host=127.0.0.1
\
...
@@ -1185,6 +1186,11 @@ run_testcase ()
...
@@ -1185,6 +1186,11 @@ run_testcase ()
fi
fi
fi
fi
if
[
"
$tname
"
'<'
"
$START_FROM
"
]
;
then
# skip_test $tname;
return
;
fi
if
[
-n
"
$DO_TEST
"
]
;
then
if
[
-n
"
$DO_TEST
"
]
;
then
DO_THIS_TEST
=
`
$EXPR
\(
$tname
:
"
$DO_TEST
"
\)
!=
0
`
DO_THIS_TEST
=
`
$EXPR
\(
$tname
:
"
$DO_TEST
"
\)
!=
0
`
if
[
x
$DO_THIS_TEST
=
x0
]
;
if
[
x
$DO_THIS_TEST
=
x0
]
;
...
...
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