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
a25b5bd4
Commit
a25b5bd4
authored
Feb 03, 2014
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fix a few GCC errors an warnings
modified: storage/connect/ha_connect.cc storage/connect/mycat.cc
parent
5133cb5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+2
-2
storage/connect/mycat.cc
storage/connect/mycat.cc
+5
-3
No files found.
storage/connect/ha_connect.cc
View file @
a25b5bd4
...
...
@@ -3141,7 +3141,7 @@ int ha_connect::external_lock(THD *thd, int lock_type)
DBUG_ASSERT
(
thd
==
current_thd
);
if
(
xtrace
)
printf
(
"external_lock: this=%p thd=%p xp=%
d
g=%p lock_type=%d
\n
"
,
printf
(
"external_lock: this=%p thd=%p xp=%
p
g=%p lock_type=%d
\n
"
,
this
,
thd
,
xp
,
g
,
lock_type
);
if
(
!
g
)
...
...
@@ -4920,7 +4920,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
}
// endif
if
(
xtrace
)
printf
(
"xchk=%
d
createas=%d
\n
"
,
g
->
Xchk
,
g
->
Createas
);
printf
(
"xchk=%
p
createas=%d
\n
"
,
g
->
Xchk
,
g
->
Createas
);
// To check whether indices have to be made or remade
if
(
!
g
->
Xchk
)
{
...
...
storage/connect/mycat.cc
View file @
a25b5bd4
...
...
@@ -98,6 +98,8 @@ extern "C" HINSTANCE s_hModule; // Saved module handle
extern
int
xtrace
;
PQRYRES
OEMColumns
(
PGLOBAL
g
,
PTOS
topt
,
char
*
tab
,
char
*
db
,
bool
info
);
/***********************************************************************/
/* Get a unique enum table type ID. */
/***********************************************************************/
...
...
@@ -264,7 +266,7 @@ uint GetFuncID(const char *func)
/***********************************************************************/
PQRYRES
OEMColumns
(
PGLOBAL
g
,
PTOS
topt
,
char
*
tab
,
char
*
db
,
bool
info
)
{
typedef
PQRYRES
(
__stdcall
*
XCOLDEF
)
(
PGLOBAL
,
PVOID
,
char
*
,
char
*
,
bool
);
typedef
PQRYRES
(
__stdcall
*
XCOLDEF
)
(
PGLOBAL
,
void
*
,
char
*
,
char
*
,
bool
);
const
char
*
module
,
*
subtype
;
char
c
,
getname
[
40
]
=
"Col"
;
#if defined(WIN32)
...
...
@@ -312,9 +314,9 @@ PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info)
const
char
*
error
=
NULL
;
// Load the desired shared library
if
(
!
(
hdll
=
dlopen
(
M
odule
,
RTLD_LAZY
)))
{
if
(
!
(
hdll
=
dlopen
(
m
odule
,
RTLD_LAZY
)))
{
error
=
dlerror
();
sprintf
(
g
->
Message
,
MSG
(
SHARED_LIB_ERR
),
M
odule
,
SVP
(
error
));
sprintf
(
g
->
Message
,
MSG
(
SHARED_LIB_ERR
),
m
odule
,
SVP
(
error
));
return
NULL
;
}
// endif Hdll
...
...
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