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
622891c6
Commit
622891c6
authored
Apr 13, 2015
by
Daniel Black
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mariadb_fix_view to allow fixing of view->mariadb_version
Reverts the wrong_checksum part of
29721d7d
parent
8a827d53
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
sql/sql_view.cc
sql/sql_view.cc
+3
-5
No files found.
sql/sql_view.cc
View file @
622891c6
...
...
@@ -818,7 +818,7 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum,
LEX_STRING
dir
,
file
,
path
;
DBUG_ENTER
(
"mariadb_fix_view"
);
if
(
view
->
mariadb_version
)
if
(
!
wrong_checksum
&&
view
->
mariadb_version
)
DBUG_RETURN
(
HA_ADMIN_OK
);
make_view_filename
(
&
dir
,
dir_buff
,
sizeof
(
dir_buff
),
...
...
@@ -2073,12 +2073,10 @@ int view_check(THD *thd, TABLE_LIST *view, HA_CHECK_OPT *check_opt)
int
view_repair
(
THD
*
thd
,
TABLE_LIST
*
view
,
HA_CHECK_OPT
*
check_opt
)
{
DBUG_ENTER
(
"view_repair"
);
bool
swap_alg
=
((
check_opt
->
sql_flags
&
TT_FROM_MYSQL
)
&&
(
!
view
->
mariadb_version
));
bool
swap_alg
=
(
check_opt
->
sql_flags
&
TT_FROM_MYSQL
);
bool
wrong_checksum
=
view_checksum
(
thd
,
view
);
int
ret
;
if
(
wrong_checksum
||
swap_alg
)
if
(
wrong_checksum
||
swap_alg
||
(
!
view
->
mariadb_version
)
)
{
ret
=
mariadb_fix_view
(
thd
,
view
,
wrong_checksum
,
swap_alg
);
DBUG_RETURN
(
ret
);
...
...
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