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
dbc3ef6c
Commit
dbc3ef6c
authored
Mar 07, 2008
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
parents
48f92065
11cd97ed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
0 deletions
+9
-0
client/mysqldump.c
client/mysqldump.c
+1
-0
mysql-test/r/mysqldump-no-binlog.result
mysql-test/r/mysqldump-no-binlog.result
+1
-0
mysql-test/t/mysqldump-no-binlog-master.opt
mysql-test/t/mysqldump-no-binlog-master.opt
+1
-0
mysql-test/t/mysqldump-no-binlog.test
mysql-test/t/mysqldump-no-binlog.test
+6
-0
No files found.
client/mysqldump.c
View file @
dbc3ef6c
...
@@ -4306,6 +4306,7 @@ static int do_show_master_status(MYSQL *mysql_con)
...
@@ -4306,6 +4306,7 @@ static int do_show_master_status(MYSQL *mysql_con)
my_printf_error
(
0
,
"Error: Binlogging on server not active"
,
my_printf_error
(
0
,
"Error: Binlogging on server not active"
,
MYF
(
0
));
MYF
(
0
));
mysql_free_result
(
master
);
mysql_free_result
(
master
);
maybe_exit
(
EX_MYSQLERR
);
return
1
;
return
1
;
}
}
mysql_free_result
(
master
);
mysql_free_result
(
master
);
...
...
mysql-test/r/mysqldump-no-binlog.result
0 → 100644
View file @
dbc3ef6c
mysqldump: Error: Binlogging on server not active
mysql-test/t/mysqldump-no-binlog-master.opt
0 → 100644
View file @
dbc3ef6c
--skip-log-bin
mysql-test/t/mysqldump-no-binlog.test
0 → 100644
View file @
dbc3ef6c
# Embedded server doesn't support external clients
--
source
include
/
not_embedded
.
inc
--
replace_regex
/
MASTER_LOG_POS
=
[
0
-
9
]
+/
XX
/
--
error
2
--
exec
$MYSQL_DUMP
--
compact
--
master
-
data
=
2
test
2
>&
1
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