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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
535b514e
Commit
535b514e
authored
Jun 03, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-8123 mysqlcheck: new --process-views option conflicts with --quick, --extended and such
parent
64569fa8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
5 deletions
+48
-5
client/mysqlcheck.c
client/mysqlcheck.c
+13
-5
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqlcheck.result
+14
-0
mysql-test/t/mysqlcheck.test
mysql-test/t/mysqlcheck.test
+21
-0
No files found.
client/mysqlcheck.c
View file @
535b514e
...
@@ -861,11 +861,19 @@ static int handle_request_for_tables(char *tables, size_t length, my_bool view)
...
@@ -861,11 +861,19 @@ static int handle_request_for_tables(char *tables, size_t length, my_bool view)
switch
(
what_to_do
)
{
switch
(
what_to_do
)
{
case
DO_CHECK
:
case
DO_CHECK
:
op
=
"CHECK"
;
op
=
"CHECK"
;
if
(
view
)
{
if
(
opt_fast
||
opt_check_only_changed
)
DBUG_RETURN
(
0
);
}
else
{
if
(
opt_quick
)
end
=
strmov
(
end
,
" QUICK"
);
if
(
opt_quick
)
end
=
strmov
(
end
,
" QUICK"
);
if
(
opt_fast
)
end
=
strmov
(
end
,
" FAST"
);
if
(
opt_fast
)
end
=
strmov
(
end
,
" FAST"
);
if
(
opt_medium_check
)
end
=
strmov
(
end
,
" MEDIUM"
);
/* Default */
if
(
opt_extended
)
end
=
strmov
(
end
,
" EXTENDED"
);
if
(
opt_extended
)
end
=
strmov
(
end
,
" EXTENDED"
);
if
(
opt_medium_check
)
end
=
strmov
(
end
,
" MEDIUM"
);
/* Default */
if
(
opt_check_only_changed
)
end
=
strmov
(
end
,
" CHANGED"
);
if
(
opt_check_only_changed
)
end
=
strmov
(
end
,
" CHANGED"
);
}
if
(
opt_upgrade
)
end
=
strmov
(
end
,
" FOR UPGRADE"
);
if
(
opt_upgrade
)
end
=
strmov
(
end
,
" FOR UPGRADE"
);
break
;
break
;
case
DO_REPAIR
:
case
DO_REPAIR
:
...
...
mysql-test/r/mysqlcheck.result
View file @
535b514e
...
@@ -316,3 +316,17 @@ CREATE TABLE test.`t.1` (id int);
...
@@ -316,3 +316,17 @@ CREATE TABLE test.`t.1` (id int);
mysqlcheck test t.1
mysqlcheck test t.1
test.t.1 OK
test.t.1 OK
drop table test.`t.1`;
drop table test.`t.1`;
create view v1 as select 1;
mysqlcheck --process-views test
test.v1 OK
mysqlcheck --process-views --extended test
test.v1 OK
mysqlcheck --process-views --fast test
mysqlcheck --process-views --quick test
test.v1 OK
mysqlcheck --process-views --check-only-changed test
mysqlcheck --process-views --medium-check test
test.v1 OK
mysqlcheck --process-views --check-upgrade test
test.v1 OK
drop view v1;
mysql-test/t/mysqlcheck.test
View file @
535b514e
...
@@ -323,3 +323,24 @@ CREATE TABLE test.`t.1` (id int);
...
@@ -323,3 +323,24 @@ CREATE TABLE test.`t.1` (id int);
--
exec
$MYSQL_CHECK
test
t
.
1
--
exec
$MYSQL_CHECK
test
t
.
1
drop
table
test
.
`t.1`
;
drop
table
test
.
`t.1`
;
#
# MDEV-8123 mysqlcheck: new --process-views option conflicts with --quick, --extended and such
#
create
view
v1
as
select
1
;
--
echo
mysqlcheck
--
process
-
views
test
--
exec
$MYSQL_CHECK
--
process
-
views
test
--
echo
mysqlcheck
--
process
-
views
--
extended
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
extended
test
--
echo
mysqlcheck
--
process
-
views
--
fast
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
fast
test
--
echo
mysqlcheck
--
process
-
views
--
quick
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
quick
test
--
echo
mysqlcheck
--
process
-
views
--
check
-
only
-
changed
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
check
-
only
-
changed
test
--
echo
mysqlcheck
--
process
-
views
--
medium
-
check
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
medium
-
check
test
--
echo
mysqlcheck
--
process
-
views
--
check
-
upgrade
test
--
exec
$MYSQL_CHECK
--
process
-
views
--
check
-
upgrade
test
drop
view
v1
;
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