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
f7cc6d16
Commit
f7cc6d16
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
parents
d7579018
e4d2a0c5
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
12 deletions
+10
-12
mysql-test/include/is_debug_build.inc
mysql-test/include/is_debug_build.inc
+0
-4
mysql-test/include/uses_vardir.inc
mysql-test/include/uses_vardir.inc
+2
-3
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+6
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
mysql-test/t/sp-code.test
mysql-test/t/sp-code.test
+1
-1
No files found.
mysql-test/include/is_debug_build.inc
deleted
100644 → 0
View file @
d7579018
--
require
r
/
is_debug_build
.
require
--
disable_query_log
select
instr
(
version
(),
"debug"
)
>
0
;
--
enable_query_log
This diff is collapsed.
Click to expand it.
mysql-test/include/uses_vardir.inc
View file @
f7cc6d16
...
...
@@ -7,9 +7,8 @@
# outside of it's vardir anyway
#
let
$datadir
=
query_get_value
(
"SHOW VARIABLES LIKE 'datadir'"
,
Value
,
1
);
if
(
`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`
)
if
(
`select LOCATE('$MYSQLTEST_VARDIR', REPLACE(@@datadir, '\\\\', '/')) != 1`
)
{
skip
Need
mysqld
in
MYSQLTEST_VARDIR
;
}
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_cases.pl
View file @
f7cc6d16
...
...
@@ -607,9 +607,12 @@ sub collect_one_test_case($$$$$$$) {
}
else
{
# Test does not need binlog, add --skip-binlog to
# the options used when starting it
push
(
@
{
$tinfo
->
{'
master_opt
'}},
"
--skip-log-bin
");
if
(
$::mysql_version_id
>=
50100
)
{
# Test does not need binlog, add --skip-binlog to
# the options used when starting it
push
(
@
{
$tinfo
->
{'
master_opt
'}},
"
--skip-log-bin
");
}
}
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
f7cc6d16
...
...
@@ -771,7 +771,7 @@ sub command_line_setup () {
# Find out type of logging that are being used
# --------------------------------------------------------------------------
# NOTE if the default binlog format is changed, this has to be changed
$used_binlog_format
=
"
st
m
t
";
$used_binlog_format
=
"
st
atemen
t
";
if
(
!
$opt_extern
&&
$mysql_version_id
>=
50100
)
{
$used_binlog_format
=
"
mixed
";
# Default value for binlog format
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/sp-code.test
View file @
f7cc6d16
...
...
@@ -2,7 +2,7 @@
# Test the debugging feature "show procedure/function code <name>"
#
--
source
include
/
is_debug_build
.
inc
--
source
include
/
have_debug
.
inc
--
disable_warnings
drop
procedure
if
exists
empty
;
...
...
This diff is collapsed.
Click to expand it.
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