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
3f25e2f3
Commit
3f25e2f3
authored
23 years ago
by
monty@donna.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
parents
450d98e3
d2a02334
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
Build-tools/Do-compile
Build-tools/Do-compile
+5
-2
Docs/manual.texi
Docs/manual.texi
+5
-0
sql/slave.cc
sql/slave.cc
+2
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+3
-2
No files found.
Build-tools/Do-compile
View file @
3f25e2f3
...
@@ -27,11 +27,11 @@ if (defined($gcc_version) && ! $opt_config_env)
...
@@ -27,11 +27,11 @@ if (defined($gcc_version) && ! $opt_config_env)
$tmp
=
`
$gcc_version
-v 2>&1
`;
$tmp
=
`
$gcc_version
-v 2>&1
`;
if
(
$tmp
=~
/version 2\.7\./
)
if
(
$tmp
=~
/version 2\.7\./
)
{
{
$opt_config_env
=
'
CC=gcc CFLAGS="-O2 -f
omit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -f
omit-frame-pointer"
';
$opt_config_env
=
'
CC=gcc CFLAGS="-O2 -f
no-omit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fno-
omit-frame-pointer"
';
}
}
else
else
{
{
$opt_config_env
=
'
CC=gcc CFLAGS="-O3 -f
omit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -f
omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"
';
$opt_config_env
=
'
CC=gcc CFLAGS="-O3 -f
no-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fno-
omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti"
';
}
}
}
}
...
@@ -68,6 +68,9 @@ if ($opt_stage == 0)
...
@@ -68,6 +68,9 @@ if ($opt_stage == 0)
if
(
-
x
"
$host
/bin/mysqladmin
")
if
(
-
x
"
$host
/bin/mysqladmin
")
{
{
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -S
$mysql_unix_port
-s shutdown
");
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -S
$mysql_unix_port
-s shutdown
");
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -P
$mysql_tcp_port
-h
$host
-s shutdown
");
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -P 9306 -h
$host
-s shutdown
");
log_system
("
$host
/bin/mysqladmin --no-defaults -u root -P 9307 -h
$host
-s shutdown
");
}
}
system
("
mkdir
$host
")
if
(
!
-
d
$host
);
system
("
mkdir
$host
")
if
(
!
-
d
$host
);
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
...
...
This diff is collapsed.
Click to expand it.
Docs/manual.texi
View file @
3f25e2f3
...
@@ -4596,6 +4596,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
...
@@ -4596,6 +4596,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@image{Flags/japan} Japan [Soft Agency] @
@image{Flags/japan} Japan [Soft Agency] @
@uref{http://www.softagency.co.jp/MySQL, WWW}
@uref{http://www.softagency.co.jp/MySQL, WWW}
@item
@c EMAIL: takafumi@u-aizu.ac.jp (Takafumi Hayashi)
@image{Flags/japan} Japan [u-aizu.ac.jp/Aizu] @
@uref{ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com, FTP}
@c @item
@c @item
@c Ok 980109 Removed 990730
@c Ok 980109 Removed 990730
@c EMAIL: satoshi@HappySize.co.jp (Satoshi TATSUOKA)
@c EMAIL: satoshi@HappySize.co.jp (Satoshi TATSUOKA)
This diff is collapsed.
Click to expand it.
sql/slave.cc
View file @
3f25e2f3
...
@@ -849,7 +849,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
...
@@ -849,7 +849,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len)
mi
->
inc_pos
(
event_len
);
mi
->
inc_pos
(
event_len
);
flush_master_info
(
mi
);
flush_master_info
(
mi
);
--
slave_skip_counter
;
if
(
slave_skip_counter
)
--
slave_skip_counter
;
delete
ev
;
delete
ev
;
return
0
;
// avoid infinite update loops
return
0
;
// avoid infinite update loops
}
}
...
...
This diff is collapsed.
Click to expand it.
support-files/mysql.spec.sh
View file @
3f25e2f3
...
@@ -140,10 +140,11 @@ BuildMySQL() {
...
@@ -140,10 +140,11 @@ BuildMySQL() {
# support assembler speedups.
# support assembler speedups.
sh
-c
"PATH=
\"
${
MYSQL_BUILD_PATH
:-
/bin
:/usr/bin
}
\"
\
sh
-c
"PATH=
\"
${
MYSQL_BUILD_PATH
:-
/bin
:/usr/bin
}
\"
\
CC=
\"
${
MYSQL_BUILD_CC
:-
egcs
}
\"
\
CC=
\"
${
MYSQL_BUILD_CC
:-
egcs
}
\"
\
CFLAGS=
\"
${
MYSQL_BUILD_CFLAGS
:-
-O6
}
\"
\
CFLAGS=
\"
${
MYSQL_BUILD_CFLAGS
:-
-O6
-fno-omit-frame-pointer
}
\"
\
CXX=
\"
${
MYSQL_BUILD_CXX
:-
egcs
}
\"
\
CXX=
\"
${
MYSQL_BUILD_CXX
:-
egcs
}
\"
\
CXXFLAGS=
\"
${
MYSQL_BUILD_CXXFLAGS
:-
-O6 \
CXXFLAGS=
\"
${
MYSQL_BUILD_CXXFLAGS
:-
-O6 \
-felide-constructors -fno-exceptions -fno-rtti
}
\"
\
-felide-constructors -fno-exceptions -fno-rtti \
-fno-omit-frame-pointer
}
\"
\
./configure
\
./configure
\
$*
\
$*
\
--enable-assembler
\
--enable-assembler
\
...
...
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