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
dfe6e914
Commit
dfe6e914
authored
Feb 15, 2020
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove TYPE_ENUM_PROXY from enum stored_procedure_type
because it is not
parent
f3f31eaa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
6 deletions
+1
-6
sql/sp.cc
sql/sp.cc
+0
-1
sql/sp.h
sql/sp.h
+1
-4
sql/sql_acl.cc
sql/sql_acl.cc
+0
-1
No files found.
sql/sp.cc
View file @
dfe6e914
...
@@ -1241,7 +1241,6 @@ Sp_handler::sp_create_routine(THD *thd, const sp_head *sp) const
...
@@ -1241,7 +1241,6 @@ Sp_handler::sp_create_routine(THD *thd, const sp_head *sp) const
ret
=
sp_drop_routine_internal
(
thd
,
sp
,
table
);
ret
=
sp_drop_routine_internal
(
thd
,
sp
,
table
);
break
;
break
;
case
TYPE_ENUM_TRIGGER
:
case
TYPE_ENUM_TRIGGER
:
case
TYPE_ENUM_PROXY
:
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
ret
=
SP_OK
;
ret
=
SP_OK
;
}
}
...
...
sql/sp.h
View file @
dfe6e914
...
@@ -54,8 +54,7 @@ enum stored_procedure_type
...
@@ -54,8 +54,7 @@ enum stored_procedure_type
TYPE_ENUM_PROCEDURE
=
2
,
TYPE_ENUM_PROCEDURE
=
2
,
TYPE_ENUM_PACKAGE
=
3
,
TYPE_ENUM_PACKAGE
=
3
,
TYPE_ENUM_PACKAGE_BODY
=
4
,
TYPE_ENUM_PACKAGE_BODY
=
4
,
TYPE_ENUM_TRIGGER
=
5
,
TYPE_ENUM_TRIGGER
=
5
TYPE_ENUM_PROXY
=
6
};
};
...
@@ -506,8 +505,6 @@ inline const Sp_handler *Sp_handler::handler(stored_procedure_type type)
...
@@ -506,8 +505,6 @@ inline const Sp_handler *Sp_handler::handler(stored_procedure_type type)
return
&
sp_handler_package_body
;
return
&
sp_handler_package_body
;
case
TYPE_ENUM_TRIGGER
:
case
TYPE_ENUM_TRIGGER
:
return
&
sp_handler_trigger
;
return
&
sp_handler_trigger
;
case
TYPE_ENUM_PROXY
:
break
;
}
}
return
NULL
;
return
NULL
;
}
}
...
...
sql/sql_acl.cc
View file @
dfe6e914
...
@@ -5883,7 +5883,6 @@ static enum PRIVS_TO_MERGE::what sp_privs_to_merge(stored_procedure_type type)
...
@@ -5883,7 +5883,6 @@ static enum PRIVS_TO_MERGE::what sp_privs_to_merge(stored_procedure_type type)
case
TYPE_ENUM_PACKAGE_BODY
:
case
TYPE_ENUM_PACKAGE_BODY
:
return
PRIVS_TO_MERGE
::
PACKAGE_BODY
;
return
PRIVS_TO_MERGE
::
PACKAGE_BODY
;
case
TYPE_ENUM_TRIGGER
:
case
TYPE_ENUM_TRIGGER
:
case
TYPE_ENUM_PROXY
:
break
;
break
;
}
}
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
...
...
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