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
0bdfbfe8
Commit
0bdfbfe8
authored
Apr 21, 2006
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #19255 ndb: restore of ndb backup from different endian does not work
+ removed not needed --
parent
fe67d648
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
storage/ndb/tools/restore/Restore.cpp
storage/ndb/tools/restore/Restore.cpp
+3
-1
No files found.
mysql-test/mysql-test-run.pl
View file @
0bdfbfe8
...
@@ -1524,7 +1524,7 @@ sub ndbcluster_start ($) {
...
@@ -1524,7 +1524,7 @@ sub ndbcluster_start ($) {
if
(
mtr_run
("
$glob_mysql_test_dir
/ndb/ndbcluster
",
if
(
mtr_run
("
$glob_mysql_test_dir
/ndb/ndbcluster
",
["
--port=
$opt_ndbcluster_port
",
["
--port=
$opt_ndbcluster_port
",
"
--data-dir=
$opt_vardir
",
"
--data-dir=
$opt_vardir
",
"
--character-sets-dir=
$path_charsetsdir
"
]
,
"
--character-sets-dir=
$path_charsetsdir
",
"
--verbose=2
",
"
--verbose=2
",
"
--core
"],
"
--core
"],
"",
"
/dev/null
",
"",
"")
)
"",
"
/dev/null
",
"",
"")
)
...
...
storage/ndb/tools/restore/Restore.cpp
View file @
0bdfbfe8
...
@@ -1021,7 +1021,6 @@ RestoreLogIterator::getNextLogEntry(int & res) {
...
@@ -1021,7 +1021,6 @@ RestoreLogIterator::getNextLogEntry(int & res) {
if
(
hasGcp
){
if
(
hasGcp
){
// last attr_data is gci info
// last attr_data is gci info
attr_data_len
--
;
attr_data_len
--
;
len
--
;
m_last_gci
=
ntohl
(
*
(
attr_data
+
attr_data_len
));
m_last_gci
=
ntohl
(
*
(
attr_data
+
attr_data_len
));
}
}
}
while
(
m_last_gci
>
stopGCP
+
1
);
}
while
(
m_last_gci
>
stopGCP
+
1
);
...
@@ -1057,6 +1056,9 @@ RestoreLogIterator::getNextLogEntry(int & res) {
...
@@ -1057,6 +1056,9 @@ RestoreLogIterator::getNextLogEntry(int & res) {
return
0
;
return
0
;
}
}
if
(
unlikely
(
!
m_hostByteOrder
))
*
(
Uint32
*
)
ah
=
Twiddle32
(
*
(
Uint32
*
)
ah
);
attr
->
Desc
=
(
*
tab
)[
ah
->
getAttributeId
()];
attr
->
Desc
=
(
*
tab
)[
ah
->
getAttributeId
()];
assert
(
attr
->
Desc
!=
0
);
assert
(
attr
->
Desc
!=
0
);
...
...
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