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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
db82d30b
Commit
db82d30b
authored
Oct 02, 2001
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for make dist
Made replication test portable Fixed buffer overrun bug in replication
parent
4dd46e34
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
client/Makefile.am
client/Makefile.am
+2
-2
mysql-test/t/rpl000017-slave.sh
mysql-test/t/rpl000017-slave.sh
+2
-2
sql/slave.cc
sql/slave.cc
+4
-4
strings/strmake.c
strings/strmake.c
+2
-1
No files found.
client/Makefile.am
View file @
db82d30b
...
@@ -19,13 +19,13 @@
...
@@ -19,13 +19,13 @@
INCLUDES
=
-I
$(srcdir)
/../include
\
INCLUDES
=
-I
$(srcdir)
/../include
\
-I
../include
-I
$(srcdir)
/..
-I
$(top_srcdir)
\
-I
../include
-I
$(srcdir)
/..
-I
$(top_srcdir)
\
-I
..
-I
..
noinst_HEADERS
=
client_priv.h
LIBS
=
@CLIENT_LIBS@
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
LDADD
=
@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
bin_PROGRAMS
=
mysql mysqladmin mysqlcheck mysqlshow
\
bin_PROGRAMS
=
mysql mysqladmin mysqlcheck mysqlshow
\
mysqldump mysqlimport mysqltest mysqlbinlog
mysqldump mysqlimport mysqltest mysqlbinlog
noinst_PROGRAMS
=
insert_test select_test thread_test
noinst_PROGRAMS
=
insert_test select_test thread_test
noinst_HEADERS
=
sql_string.h completion_hash.h my_readline.h
noinst_HEADERS
=
sql_string.h completion_hash.h my_readline.h
\
client_priv.h
mysql_SOURCES
=
mysql.cc readline.cc sql_string.cc completion_hash.cc
mysql_SOURCES
=
mysql.cc readline.cc sql_string.cc completion_hash.cc
mysql_LDADD
=
@readline_link@ @TERMCAP_LIB@
$(LDADD)
$(CXXLDFLAGS)
mysql_LDADD
=
@readline_link@ @TERMCAP_LIB@
$(LDADD)
$(CXXLDFLAGS)
mysql_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
mysql_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
...
...
mysql-test/t/rpl000017-slave.sh
View file @
db82d30b
...
@@ -3,7 +3,7 @@ master-bin.001
...
@@ -3,7 +3,7 @@ master-bin.001
4
4
127.0.0.1
127.0.0.1
replicate
replicate
aaaaaaaaaaaaaaab
aaaaaaaaaaaaaaab
thispartofthepasswordisnotused
9306
$MASTER_MYPORT
1
1
EOF
EOF
sql/slave.cc
View file @
db82d30b
...
@@ -299,7 +299,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f,
...
@@ -299,7 +299,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f,
}
}
else
if
(
default_val
)
else
if
(
default_val
)
{
{
strmake
(
var
,
default_val
,
max_size
);
strmake
(
var
,
default_val
,
max_size
-
1
);
return
0
;
return
0
;
}
}
return
1
;
return
1
;
...
@@ -530,14 +530,14 @@ int init_master_info(MASTER_INFO* mi)
...
@@ -530,14 +530,14 @@ int init_master_info(MASTER_INFO* mi)
}
}
mi
->
log_file_name
[
length
-
1
]
=
0
;
// kill \n
mi
->
log_file_name
[
length
-
1
]
=
0
;
// kill \n
char
buf
[
FN_REFLEN
];
/* Reuse fname buffer */
if
(
!
my_b_gets
(
&
mi
->
file
,
buf
,
sizeof
(
buf
)))
if
(
!
my_b_gets
(
&
mi
->
file
,
fname
,
sizeof
(
fname
)))
{
{
msg
=
"Error reading log file position from master info file"
;
msg
=
"Error reading log file position from master info file"
;
goto
error
;
goto
error
;
}
}
mi
->
pos
=
strtoull
(
fname
,(
char
**
)
0
,
10
);
mi
->
pos
=
strtoull
(
buf
,(
char
**
)
0
,
10
);
mi
->
fd
=
fd
;
mi
->
fd
=
fd
;
if
(
init_strvar_from_file
(
mi
->
host
,
sizeof
(
mi
->
host
),
&
mi
->
file
,
if
(
init_strvar_from_file
(
mi
->
host
,
sizeof
(
mi
->
host
),
&
mi
->
file
,
master_host
)
||
master_host
)
||
...
...
strings/strmake.c
View file @
db82d30b
...
@@ -22,7 +22,8 @@
...
@@ -22,7 +22,8 @@
strmake(dst,src,length) moves length characters, or until end, of src to
strmake(dst,src,length) moves length characters, or until end, of src to
dst and appends a closing NUL to dst.
dst and appends a closing NUL to dst.
strmake() returns pointer to closing null;
Note that is strlen(src) >= length then dst[length] will be set to \0
strmake() returns pointer to closing null
*/
*/
#include <global.h>
#include <global.h>
...
...
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