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
7c0a6f74
Commit
7c0a6f74
authored
Oct 14, 2013
by
rich prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 5.6 build
parent
20e2a4b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
scripts/common.sh
scripts/common.sh
+4
-2
scripts/make.mysql.bash
scripts/make.mysql.bash
+1
-1
No files found.
scripts/common.sh
View file @
7c0a6f74
...
@@ -161,7 +161,8 @@ function parse_mysqlbuild() {
...
@@ -161,7 +161,8 @@ function parse_mysqlbuild() {
if
[
-z
$jemalloc_tree
]
;
then
jemalloc_tree
=
$jemalloc_version
;
fi
if
[
-z
$jemalloc_tree
]
;
then
jemalloc_tree
=
$jemalloc_version
;
fi
fi
fi
# 5.6 is temp in another repo
# 5.6 is temp in another repo
if
[[
$mysql_distro
=
mysql
&&
$mysql_version
=
~ ^5.6
]]
;
then
mysql_distro
=
mysql56
;
fi
mysql_repo
=
$mysql_distro
if
[[
$mysql_distro
=
mysql
&&
$mysql_version
=
~ ^5.6
]]
;
then
mysql_repo
=
mysql56
;
fi
else
else
exitcode
=
1
exitcode
=
1
fi
fi
...
@@ -174,7 +175,8 @@ function parse_mysql() {
...
@@ -174,7 +175,8 @@ function parse_mysql() {
if
[[
$mysql
=
~ ^
(
mysql|mariadb
)
-
(
.
*
)
$
]]
;
then
if
[[
$mysql
=
~ ^
(
mysql|mariadb
)
-
(
.
*
)
$
]]
;
then
mysql_distro
=
${
BASH_REMATCH
[1]
}
mysql_distro
=
${
BASH_REMATCH
[1]
}
mysql_version
=
${
BASH_REMATCH
[2]
}
mysql_version
=
${
BASH_REMATCH
[2]
}
if
[[
$mysql_distro
=
mysql
&&
$mysql_version
=
~ ^5.6
]]
;
then
mysql_distro
=
mysql56
;
fi
mysql_repo
=
$mysql_distro
if
[[
$mysql_distro
=
mysql
&&
$mysql_version
=
~ ^5.6
]]
;
then
mysql_repo
=
mysql56
;
fi
exitcode
=
0
exitcode
=
0
else
else
exitcode
=
1
exitcode
=
1
...
...
scripts/make.mysql.bash
View file @
7c0a6f74
...
@@ -97,7 +97,7 @@ fi
...
@@ -97,7 +97,7 @@ fi
# download all the mysql source
# download all the mysql source
if
[
!
-d
$mysql_distro
]
;
then
if
[
!
-d
$mysql_distro
]
;
then
github_download Tokutek/
$mysql_
distr
o
$(
git_tree
$git_tag
$mysql_tree
)
$mysql_distro
github_download Tokutek/
$mysql_
rep
o
$(
git_tree
$git_tag
$mysql_tree
)
$mysql_distro
fi
fi
cd
$mysql_distro
cd
$mysql_distro
...
...
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