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
920e3562
Commit
920e3562
authored
Mar 28, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug14356
parents
fd1303ea
fb17414b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
63 deletions
+6
-63
mysql-test/r/rpl_ndb_sp007.result
mysql-test/r/rpl_ndb_sp007.result
+0
-50
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+0
-1
mysql-test/t/partition_mgm_err2.test
mysql-test/t/partition_mgm_err2.test
+1
-0
mysql-test/t/rpl_ndb_sp007.test
mysql-test/t/rpl_ndb_sp007.test
+0
-9
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+4
-2
storage/ndb/test/ndbapi/test_event.cpp
storage/ndb/test/ndbapi/test_event.cpp
+1
-1
No files found.
mysql-test/r/rpl_ndb_sp007.result
deleted
100644 → 0
View file @
fd1303ea
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
CREATE PROCEDURE test.p1(IN i INT)
BEGIN
DECLARE CONTINUE HANDLER FOR sqlexception BEGIN END;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (num INT,PRIMARY KEY(num))ENGINE=NDBCLUSTER;
START TRANSACTION;
INSERT INTO test.t1 VALUES(i);
savepoint t1_save;
INSERT INTO test.t1 VALUES (14);
ROLLBACK to savepoint t1_save;
COMMIT;
END|
< ---- Master selects-- >
-------------------------
CALL test.p1(12);
Warnings:
Note 1051 Unknown table 't1'
SELECT * FROM test.t1;
num
12
< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
12
< ---- Master selects-- >
-------------------------
CALL test.p1(13);
SELECT * FROM test.t1;
num
13
< ---- Slave selects-- >
------------------------
SELECT * FROM test.t1;
num
13
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
mysql-test/t/disabled.def
View file @
920e3562
...
@@ -38,7 +38,6 @@ rpl_ndb_myisam2ndb : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb
...
@@ -38,7 +38,6 @@ rpl_ndb_myisam2ndb : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb
rpl_ndb_log : result not deterministic, TBD if should remove
rpl_ndb_log : result not deterministic, TBD if should remove
rpl_ndb_relay_space : Bug#16993
rpl_ndb_relay_space : Bug#16993
#rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
#rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_sp007 : Bug #18565
rpl_row_inexist_tbl : Disabled since patch makes this test wait forever
rpl_row_inexist_tbl : Disabled since patch makes this test wait forever
rpl_sp : Bug#16456
rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
rpl_until : Unstable test case, bug#15886
...
...
mysql-test/t/partition_mgm_err2.test
View file @
920e3562
#
#
# Test of partitions that require symlinks
# Test of partitions that require symlinks
#
#
--
source
include
/
have_partition
.
inc
--
require
r
/
have_symlink
.
require
--
require
r
/
have_symlink
.
require
disable_query_log
;
disable_query_log
;
...
...
mysql-test/t/rpl_ndb_sp007.test
deleted
100644 → 0
View file @
fd1303ea
#################################
# Wrapper for rpl_row_sp007.test#
# These tests have been wrapped #
# so the same code can be used #
# For different engines #
#################################
--
source
include
/
have_ndb
.
inc
let
$engine_type
=
NDBCLUSTER
;
--
source
extra
/
rpl_tests
/
rpl_row_sp007
.
test
sql/ha_ndbcluster.cc
View file @
920e3562
...
@@ -74,6 +74,8 @@ handlerton ndbcluster_hton = {
...
@@ -74,6 +74,8 @@ handlerton ndbcluster_hton = {
DB_TYPE_NDBCLUSTER
,
DB_TYPE_NDBCLUSTER
,
ndbcluster_init
,
ndbcluster_init
,
~
(
uint
)
0
,
/* slot */
~
(
uint
)
0
,
/* slot */
/* below are initialized by name in ndbcluster_init() */
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
};
static
handler
*
ndbcluster_create_handler
(
TABLE_SHARE
*
table
)
static
handler
*
ndbcluster_create_handler
(
TABLE_SHARE
*
table
)
...
@@ -2336,7 +2338,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
...
@@ -2336,7 +2338,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
if
(
generate_scan_filter
(
m_cond_stack
,
op
))
if
(
generate_scan_filter
(
m_cond_stack
,
op
))
DBUG_RETURN
(
ndb_err
(
trans
));
DBUG_RETURN
(
ndb_err
(
trans
));
if
(
res
=
define_read_attrs
(
buf
,
op
))
if
(
(
res
=
define_read_attrs
(
buf
,
op
)
))
{
{
DBUG_RETURN
(
res
);
DBUG_RETURN
(
res
);
}
}
...
@@ -9235,7 +9237,7 @@ char* ha_ndbcluster::get_tablespace_name(THD *thd)
...
@@ -9235,7 +9237,7 @@ char* ha_ndbcluster::get_tablespace_name(THD *thd)
{
{
NdbDictionary
::
Tablespace
ts
=
ndbdict
->
getTablespace
(
id
);
NdbDictionary
::
Tablespace
ts
=
ndbdict
->
getTablespace
(
id
);
ndberr
=
ndbdict
->
getNdbError
();
ndberr
=
ndbdict
->
getNdbError
();
if
(
ndberr
.
classification
!=
ndberror_cl_none
)
if
(
ndberr
.
classification
!=
NdbError
::
NoError
)
goto
err
;
goto
err
;
return
(
my_strdup
(
ts
.
getName
(),
MYF
(
0
)));
return
(
my_strdup
(
ts
.
getName
(),
MYF
(
0
)));
}
}
...
...
storage/ndb/test/ndbapi/test_event.cpp
View file @
920e3562
...
@@ -1537,7 +1537,7 @@ static int runCreateDropNR(NDBT_Context* ctx, NDBT_Step* step)
...
@@ -1537,7 +1537,7 @@ static int runCreateDropNR(NDBT_Context* ctx, NDBT_Step* step)
break
;
break
;
}
}
NdbDictionary
::
Table
tmp
(
*
pTab
);
NdbDictionary
::
Table
tmp
(
*
pTab
);
tmp
.
setNodeGroupIds
(
0
,
0
);
//
tmp.setNodeGroupIds(0, 0);
if
(
ndb
->
getDictionary
()
->
createTable
(
tmp
)
!=
0
){
if
(
ndb
->
getDictionary
()
->
createTable
(
tmp
)
!=
0
){
g_err
<<
"createTable failed: "
g_err
<<
"createTable failed: "
<<
ndb
->
getDictionary
()
->
getNdbError
()
<<
endl
;
<<
ndb
->
getDictionary
()
->
getNdbError
()
<<
endl
;
...
...
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