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
0bccf7a9
Commit
0bccf7a9
authored
Aug 04, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents
96a57976
438f11ef
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
138 additions
and
1 deletion
+138
-1
mysql-test/r/ndb_limit.result
mysql-test/r/ndb_limit.result
+31
-0
mysql-test/r/ndb_truncate.result
mysql-test/r/ndb_truncate.result
+14
-0
mysql-test/t/ndb_limit.test
mysql-test/t/ndb_limit.test
+44
-0
mysql-test/t/ndb_truncate.test
mysql-test/t/ndb_truncate.test
+33
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+14
-0
sql/handler.h
sql/handler.h
+2
-1
No files found.
mysql-test/r/ndb_limit.result
0 → 100644
View file @
0bccf7a9
DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (
a bigint unsigned NOT NULL PRIMARY KEY,
b int unsigned not null,
c int unsigned
) engine=ndbcluster;
select count(*) from t2;
count(*)
10000
delete from t2 limit 1;
select count(*) from t2;
count(*)
9999
delete from t2 limit 100;
select count(*) from t2;
count(*)
9899
delete from t2 limit 1000;
select count(*) from t2;
count(*)
8899
update t2 set c=12345678 limit 100;
select count(*) from t2 where c=12345678;
count(*)
100
select count(*) from t2 where c=12345678 limit 1000;
count(*)
100
select * from t2 limit 0;
a b c
drop table t2;
mysql-test/r/ndb_truncate.result
0 → 100644
View file @
0bccf7a9
DROP TABLE IF EXISTS t2;
CREATE TABLE t2 (
a bigint unsigned NOT NULL PRIMARY KEY,
b int unsigned not null,
c int unsigned
) engine=ndbcluster;
select count(*) from t2;
count(*)
5000
truncate table t2;
select count(*) from t2;
count(*)
0
drop table t2;
mysql-test/t/ndb_limit.test
0 → 100644
View file @
0bccf7a9
--
source
include
/
have_ndb
.
inc
--
disable_warnings
DROP
TABLE
IF
EXISTS
t2
;
--
enable_warnings
CREATE
TABLE
t2
(
a
bigint
unsigned
NOT
NULL
PRIMARY
KEY
,
b
int
unsigned
not
null
,
c
int
unsigned
)
engine
=
ndbcluster
;
#
# insert records into table
#
let
$
1
=
1000
;
disable_query_log
;
while
(
$
1
)
{
eval
insert
into
t2
values
(
$
1
*
10
,
$
1
+
9
,
5
*
$
1
),
(
$
1
*
10
+
1
,
$
1
+
10
,
7
),(
$
1
*
10
+
2
,
$
1
+
10
,
7
*
$
1
),
(
$
1
*
10
+
3
,
$
1
+
10
,
10
+
$
1
),
(
$
1
*
10
+
4
,
$
1
+
10
,
70
*
$
1
),
(
$
1
*
10
+
5
,
$
1
+
10
,
7
),
(
$
1
*
10
+
6
,
$
1
+
10
,
9
),
(
$
1
*
10
+
7
,
$
1
+
299
,
899
),
(
$
1
*
10
+
8
,
$
1
+
10
,
12
),
(
$
1
*
10
+
9
,
$
1
+
10
,
14
*
$
1
);
dec
$
1
;
}
enable_query_log
;
select
count
(
*
)
from
t2
;
delete
from
t2
limit
1
;
select
count
(
*
)
from
t2
;
delete
from
t2
limit
100
;
select
count
(
*
)
from
t2
;
delete
from
t2
limit
1000
;
select
count
(
*
)
from
t2
;
update
t2
set
c
=
12345678
limit
100
;
select
count
(
*
)
from
t2
where
c
=
12345678
;
select
count
(
*
)
from
t2
where
c
=
12345678
limit
1000
;
select
*
from
t2
limit
0
;
drop
table
t2
;
mysql-test/t/ndb_truncate.test
0 → 100644
View file @
0bccf7a9
--
source
include
/
have_ndb
.
inc
--
disable_warnings
DROP
TABLE
IF
EXISTS
t2
;
--
enable_warnings
CREATE
TABLE
t2
(
a
bigint
unsigned
NOT
NULL
PRIMARY
KEY
,
b
int
unsigned
not
null
,
c
int
unsigned
)
engine
=
ndbcluster
;
#
# insert records into table
#
let
$
1
=
500
;
disable_query_log
;
while
(
$
1
)
{
eval
insert
into
t2
values
(
$
1
*
10
,
$
1
+
9
,
5
*
$
1
),
(
$
1
*
10
+
1
,
$
1
+
10
,
7
),(
$
1
*
10
+
2
,
$
1
+
10
,
7
*
$
1
),
(
$
1
*
10
+
3
,
$
1
+
10
,
10
+
$
1
),
(
$
1
*
10
+
4
,
$
1
+
10
,
70
*
$
1
),
(
$
1
*
10
+
5
,
$
1
+
10
,
7
),
(
$
1
*
10
+
6
,
$
1
+
10
,
9
),
(
$
1
*
10
+
7
,
$
1
+
299
,
899
),
(
$
1
*
10
+
8
,
$
1
+
10
,
12
),
(
$
1
*
10
+
9
,
$
1
+
10
,
14
*
$
1
);
dec
$
1
;
}
enable_query_log
;
select
count
(
*
)
from
t2
;
truncate
table
t2
;
select
count
(
*
)
from
t2
;
drop
table
t2
;
sql/ha_ndbcluster.cc
View file @
0bccf7a9
...
...
@@ -1937,11 +1937,25 @@ int ha_ndbcluster::rnd_init(bool scan)
int
ha_ndbcluster
::
close_scan
()
{
NdbResultSet
*
cursor
=
m_active_cursor
;
NdbConnection
*
trans
=
m_active_trans
;
DBUG_ENTER
(
"close_scan"
);
if
(
!
cursor
)
DBUG_RETURN
(
1
);
if
(
ops_pending
)
{
/*
Take over any pending transactions to the
deleteing/updating transaction before closing the scan
*/
DBUG_PRINT
(
"info"
,
(
"ops_pending: %d"
,
ops_pending
));
if
(
trans
->
execute
(
NoCommit
)
!=
0
)
DBUG_RETURN
(
ndb_err
(
trans
));
ops_pending
=
0
;
}
cursor
->
close
();
m_active_cursor
=
NULL
;
DBUG_RETURN
(
0
);
...
...
sql/handler.h
View file @
0bccf7a9
...
...
@@ -516,7 +516,8 @@ extern TYPELIB tx_isolation_typelib;
#define ha_rollback(thd) (ha_rollback_trans((thd), &((thd)->transaction.all)))
#define ha_supports_generate(T) (T != DB_TYPE_INNODB && \
T != DB_TYPE_BERKELEY_DB)
T != DB_TYPE_BERKELEY_DB && \
T != DB_TYPE_NDBCLUSTER)
bool
ha_caching_allowed
(
THD
*
thd
,
char
*
table_key
,
uint
key_length
,
uint8
cache_type
);
...
...
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