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
be6ae0bb
Commit
be6ae0bb
authored
May 11, 2018
by
Michael Widenius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't report errors from open_table() twice
parent
d853042b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
7 deletions
+2
-7
mysql-test/main/delayed.result
mysql-test/main/delayed.result
+0
-1
mysql-test/main/myisam_recover.result
mysql-test/main/myisam_recover.result
+0
-2
mysql-test/suite/maria/maria-recover.result
mysql-test/suite/maria/maria-recover.result
+0
-1
mysql-test/suite/parts/r/partition_recover_myisam.result
mysql-test/suite/parts/r/partition_recover_myisam.result
+0
-2
sql/table.cc
sql/table.cc
+2
-1
No files found.
mysql-test/main/delayed.result
View file @
be6ae0bb
...
...
@@ -500,7 +500,6 @@ call mtr.add_suppression("Checking table");
insert delayed into t1 values (2,2);
Warnings:
Error 145 Table './test/t1' is marked as crashed and should be repaired
Error 1194 Table 't1' is marked as crashed and should be repaired
Error 1034 1 client is using or hasn't closed the table properly
insert delayed into t1 values (3,3);
flush tables t1;
...
...
mysql-test/main/myisam_recover.result
View file @
be6ae0bb
...
...
@@ -87,7 +87,6 @@ a
6
Warnings:
Error 145 Table 't1' is marked as crashed and should be repaired
Error 1194 Table 't1' is marked as crashed and should be repaired
Error 1034 Number of rows changed from 3 to 6
#
# Cleanup
...
...
@@ -140,7 +139,6 @@ a
4
Warnings:
Error 145 Table 't1' is marked as crashed and should be repaired
Error 1194 Table 't1' is marked as crashed and should be repaired
Error 1034 Number of rows changed from 1 to 2
connect con2, localhost, root;
ALTER TABLE t2 ADD val INT;
...
...
mysql-test/suite/maria/maria-recover.result
View file @
be6ae0bb
...
...
@@ -27,7 +27,6 @@ ThursdayMorningsMarket
ThursdayMorningsMarketb
Warnings:
Error 145 t_corrupted2' is marked as crashed and should be repaired
Error 1194 t_corrupted2' is marked as crashed and should be repaired
Error 1034 1 client is using or hasn't closed the table properly
Error 1034 Wrong base information on indexpage at page: 1
select * from t_corrupted2;
...
...
mysql-test/suite/parts/r/partition_recover_myisam.result
View file @
be6ae0bb
...
...
@@ -18,7 +18,6 @@ a
11
Warnings:
Error 145 Table 't1_will_crash' is marked as crashed and should be repaired
Error 1194 Table 't1_will_crash' is marked as crashed and should be repaired
Error 1034 1 client is using or hasn't closed the table properly
Error 1034 Size of indexfile is: 1024 Should be: 2048
Error 1034 Size of datafile is: 77 Should be: 7
...
...
@@ -48,7 +47,6 @@ a
11
Warnings:
Error 145 Table 't1_will_crash#P#p1' is marked as crashed and should be repaired
Error 1194 Table 't1_will_crash' is marked as crashed and should be repaired
Error 1034 1 client is using or hasn't closed the table properly
Error 1034 Size of indexfile is: 1024 Should be: 2048
Error 1034 Size of datafile is: 28 Should be: 7
...
...
sql/table.cc
View file @
be6ae0bb
...
...
@@ -3468,7 +3468,8 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
/* Set a flag if the table is crashed and it can be auto. repaired */
share
->
crashed
=
(
outparam
->
file
->
auto_repair
(
ha_err
)
&&
!
(
ha_open_flags
&
HA_OPEN_FOR_REPAIR
));
outparam
->
file
->
print_error
(
ha_err
,
MYF
(
0
));
if
(
!
thd
->
is_error
())
outparam
->
file
->
print_error
(
ha_err
,
MYF
(
0
));
error_reported
=
TRUE
;
if
(
ha_err
==
HA_ERR_TABLE_DEF_CHANGED
)
...
...
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