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
739632cb
Commit
739632cb
authored
Feb 18, 2013
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved PushWarning out of HAVE_PSI_INTERFACE brackets
Modified: ha_connect.cc
parent
8e1c1949
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
17 deletions
+16
-17
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+16
-17
No files found.
storage/connect/ha_connect.cc
View file @
739632cb
...
...
@@ -287,6 +287,22 @@ ha_create_table_option connect_field_option_list[]=
};
#endif // MARIADB
/***********************************************************************/
/* Push G->Message as a MySQL warning. */
/***********************************************************************/
bool
PushWarning
(
PGLOBAL
g
,
PTDBASE
tdbp
)
{
PHC
phc
;
THD
*
thd
;
MYCAT
*
cat
=
(
MYCAT
*
)
tdbp
->
GetDef
()
->
GetCat
();
if
(
!
cat
||
!
(
phc
=
cat
->
GetHandler
())
||
!
phc
->
GetTable
()
||
!
(
thd
=
(
phc
->
GetTable
())
->
in_use
))
return
true
;
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
0
,
g
->
Message
);
return
false
;
}
// end of PushWarning
/**
@brief
...
...
@@ -308,23 +324,6 @@ static PSI_mutex_info all_connect_mutexes[]=
{
&
ex_key_mutex_CONNECT_SHARE_mutex
,
"CONNECT_SHARE::mutex"
,
0
}
};
/***********************************************************************/
/* Push G->Message as a MySQL warning. */
/***********************************************************************/
bool
PushWarning
(
PGLOBAL
g
,
PTDBASE
tdbp
)
{
PHC
phc
;
THD
*
thd
;
MYCAT
*
cat
=
(
MYCAT
*
)
tdbp
->
GetDef
()
->
GetCat
();
if
(
!
cat
||
!
(
phc
=
cat
->
GetHandler
())
||
!
phc
->
GetTable
()
||
!
(
thd
=
(
phc
->
GetTable
())
->
in_use
))
return
true
;
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
0
,
g
->
Message
);
return
false
;
}
// end of PushWarning
static
void
init_connect_psi_keys
()
{
const
char
*
category
=
"connect"
;
...
...
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