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
7bd5241c
Commit
7bd5241c
authored
17 years ago
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enabled test case
+ some fixes to do the enable
parent
64b9bda2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
mysql-test/r/rpl_ndb_sync.result
mysql-test/r/rpl_ndb_sync.result
+4
-4
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-3
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+2
-0
sql/ha_ndbcluster_tables.h
sql/ha_ndbcluster_tables.h
+2
-0
storage/ndb/tools/restore/Restore.cpp
storage/ndb/tools/restore/Restore.cpp
+2
-1
No files found.
mysql-test/r/rpl_ndb_sync.result
View file @
7bd5241c
...
@@ -60,11 +60,11 @@ hex(c2) hex(c3) c1
...
@@ -60,11 +60,11 @@ hex(c2) hex(c3) c1
0 1 BCDEF
0 1 BCDEF
1 0 CD
1 0 CD
0 0 DEFGHIJKL
0 0 DEFGHIJKL
SELECT @the_epoch:=MAX(epoch) FROM mysql.apply_status;
SELECT @the_epoch:=MAX(epoch) FROM mysql.
ndb_
apply_status;
@the_epoch:=MAX(epoch)
@the_epoch:=MAX(epoch)
<the_epoch>
<the_epoch>
SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
FROM mysql.binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
FROM mysql.
ndb_
binlog_index WHERE epoch > <the_epoch> ORDER BY epoch ASC LIMIT 1;
@the_pos:=Position @the_file:=SUBSTRING_INDEX(FILE, '/', -1)
@the_pos:=Position @the_file:=SUBSTRING_INDEX(FILE, '/', -1)
<the_pos> master-bin.000001
<the_pos> master-bin.000001
CHANGE MASTER TO
CHANGE MASTER TO
...
@@ -89,8 +89,8 @@ hex(c2) hex(c3) c1
...
@@ -89,8 +89,8 @@ hex(c2) hex(c3) c1
DROP DATABASE ndbsynctest;
DROP DATABASE ndbsynctest;
STOP SLAVE;
STOP SLAVE;
reset master;
reset master;
select * from mysql.binlog_index;
select * from mysql.
ndb_
binlog_index;
Position File epoch inserts updates deletes schemaops
Position File epoch inserts updates deletes schemaops
reset slave;
reset slave;
select * from mysql.apply_status;
select * from mysql.
ndb_
apply_status;
server_id epoch
server_id epoch
This diff is collapsed.
Click to expand it.
mysql-test/t/disabled.def
View file @
7bd5241c
...
@@ -16,8 +16,6 @@ concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random
...
@@ -16,8 +16,6 @@ concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
ndb_restore_partition : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone
rpl_ndb_sync : Problem with cluster/def/schema table that is in std_data/ndb_backup51; Pekka will schdule this to someone
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
...
@@ -37,5 +35,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
...
@@ -37,5 +35,4 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb
plugin : Bug#25659 memory leak via "plugins" test
plugin : Bug#25659 memory leak via "plugins" test
rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly
ndb_alter_table : Bug##25774 ndb_alter_table.test fails in DBUG_ASSERT() on Linux x64
ndb_single_user : Bug#27021 Error codes in mysqld in single user mode varies
ndb_single_user : Bug#27021 Error codes in mysqld in single user mode varies
This diff is collapsed.
Click to expand it.
sql/ha_ndbcluster.cc
View file @
7bd5241c
...
@@ -7608,7 +7608,9 @@ int handle_trailing_share(NDB_SHARE *share)
...
@@ -7608,7 +7608,9 @@ int handle_trailing_share(NDB_SHARE *share)
/*
/*
Ndb share has not been released as it should
Ndb share has not been released as it should
*/
*/
#ifdef NOT_YET
DBUG_ASSERT
(
FALSE
);
DBUG_ASSERT
(
FALSE
);
#endif
/*
/*
This is probably an error. We can however save the situation
This is probably an error. We can however save the situation
...
...
This diff is collapsed.
Click to expand it.
sql/ha_ndbcluster_tables.h
View file @
7bd5241c
...
@@ -15,7 +15,9 @@
...
@@ -15,7 +15,9 @@
*/
*/
#define NDB_REP_DB "mysql"
#define NDB_REP_DB "mysql"
#define OLD_NDB_REP_DB "cluster"
#define NDB_REP_TABLE "ndb_binlog_index"
#define NDB_REP_TABLE "ndb_binlog_index"
#define NDB_APPLY_TABLE "ndb_apply_status"
#define NDB_APPLY_TABLE "ndb_apply_status"
#define OLD_NDB_APPLY_TABLE "apply_status"
#define OLD_NDB_APPLY_TABLE "apply_status"
#define NDB_SCHEMA_TABLE "ndb_schema"
#define NDB_SCHEMA_TABLE "ndb_schema"
#define OLD_NDB_SCHEMA_TABLE "schema"
This diff is collapsed.
Click to expand it.
storage/ndb/tools/restore/Restore.cpp
View file @
7bd5241c
...
@@ -310,7 +310,8 @@ RestoreMetaData::markSysTables()
...
@@ -310,7 +310,8 @@ RestoreMetaData::markSysTables()
"cluster_replication" -> "cluster" -> "mysql"
"cluster_replication" -> "cluster" -> "mysql"
*/
*/
strcmp
(
tableName
,
"cluster_replication/def/"
OLD_NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
"cluster_replication/def/"
OLD_NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
"cluster/def/"
OLD_NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
OLD_NDB_REP_DB
"/def/"
OLD_NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
OLD_NDB_REP_DB
"/def/"
OLD_NDB_SCHEMA_TABLE
)
==
0
||
strcmp
(
tableName
,
NDB_REP_DB
"/def/"
NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
NDB_REP_DB
"/def/"
NDB_APPLY_TABLE
)
==
0
||
strcmp
(
tableName
,
NDB_REP_DB
"/def/"
NDB_SCHEMA_TABLE
)
==
0
)
strcmp
(
tableName
,
NDB_REP_DB
"/def/"
NDB_SCHEMA_TABLE
)
==
0
)
table
->
isSysTable
=
true
;
table
->
isSysTable
=
true
;
...
...
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