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
0a44ae65
Commit
0a44ae65
authored
Sep 21, 2017
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.
- Added missing test case for MyISAM
parent
05da63f0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
1 deletion
+43
-1
mysql-test/r/myisam.result
mysql-test/r/myisam.result
+8
-0
mysql-test/suite/maria/maria.result
mysql-test/suite/maria/maria.result
+8
-0
mysql-test/suite/maria/maria.test
mysql-test/suite/maria/maria.test
+13
-0
mysql-test/t/myisam.test
mysql-test/t/myisam.test
+13
-0
storage/maria/ha_maria.cc
storage/maria/ha_maria.cc
+1
-1
No files found.
mysql-test/r/myisam.result
View file @
0a44ae65
...
...
@@ -2569,6 +2569,14 @@ OPTIMIZE TABLE t1;
Table Op Msg_type Msg_text
test.t1 optimize status OK
DROP TABLE t1;
CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b)) engine=myisam;
INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
(6,'0'),(7,'0');
flush tables test.t1 for export;
insert into t1 values (8,'0');
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
unlock tables;
drop table t1;
show variables like 'myisam_block_size';
Variable_name Value
myisam_block_size 1024
...
...
mysql-test/suite/maria/maria.result
View file @
0a44ae65
...
...
@@ -2790,3 +2790,11 @@ test.t1 check status OK
SET aria_repair_threads=@@global.aria_repair_threads;
SET aria_sort_buffer_size=@@global.aria_sort_buffer_size;
DROP TABLE t1;
CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b));
INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
(6,'0'),(7,'0');
flush tables test.t1 for export;
insert into t1 values (8,'0');
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
unlock tables;
drop table t1;
mysql-test/suite/maria/maria.test
View file @
0a44ae65
...
...
@@ -2018,6 +2018,19 @@ SET aria_repair_threads=@@global.aria_repair_threads;
SET
aria_sort_buffer_size
=@@
global
.
aria_sort_buffer_size
;
DROP
TABLE
t1
;
#
# Check FLUSH FOR EXPORT
#
CREATE
TABLE
t1
(
a
INT
,
b
CHAR
(
10
),
KEY
(
a
),
KEY
(
b
));
INSERT
INTO
t1
VALUES
(
1
,
'0'
),(
2
,
'0'
),(
3
,
'0'
),(
4
,
'0'
),(
5
,
'0'
),
(
6
,
'0'
),(
7
,
'0'
);
flush
tables
test
.
t1
for
export
;
--
error
ER_TABLE_NOT_LOCKED_FOR_WRITE
insert
into
t1
values
(
8
,
'0'
);
unlock
tables
;
drop
table
t1
;
#
# End of test
#
...
...
mysql-test/t/myisam.test
View file @
0a44ae65
...
...
@@ -1769,6 +1769,19 @@ ALTER TABLE t1 DISABLE KEYS;
OPTIMIZE TABLE t1;
DROP TABLE t1;
#
# Check FLUSH FOR EXPORT
#
CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b)) engine=myisam;
INSERT INTO t1 VALUES(1,'
0
'),(2,'
0
'),(3,'
0
'),(4,'
0
'),(5,'
0
'),
(6,'
0
'),(7,'
0
');
flush tables test.t1 for export;
--error ER_TABLE_NOT_LOCKED_FOR_WRITE
insert into t1 values (8,'
0
');
unlock tables;
drop table t1;
#
# Check some variables
#
...
...
storage/maria/ha_maria.cc
View file @
0a44ae65
...
...
@@ -989,7 +989,7 @@ int_table_flags(HA_NULL_IN_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER |
HA_DUPLICATE_POS
|
HA_CAN_INDEX_BLOBS
|
HA_AUTO_PART_KEY
|
HA_FILE_BASED
|
HA_CAN_GEOMETRY
|
CANNOT_ROLLBACK_FLAG
|
HA_CAN_BIT_FIELD
|
HA_CAN_RTREEKEYS
|
HA_CAN_REPAIR
|
HA_CAN_VIRTUAL_COLUMNS
|
HA_CAN_VIRTUAL_COLUMNS
|
HA_CAN_EXPORT
|
HA_HAS_RECORDS
|
HA_STATS_RECORDS_IS_EXACT
),
can_enable_indexes
(
1
),
bulk_insert_single_undo
(
BULK_INSERT_NONE
)
{}
...
...
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