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
5fe0087a
Commit
5fe0087a
authored
Apr 26, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CONNECT compilation failure
parent
f22ed277
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
storage/connect/filter.h
storage/connect/filter.h
+1
-0
storage/connect/jmgoconn.cpp
storage/connect/jmgoconn.cpp
+2
-2
storage/connect/mycat.cc
storage/connect/mycat.cc
+0
-9
No files found.
storage/connect/filter.h
View file @
5fe0087a
...
...
@@ -48,6 +48,7 @@ class DllExport FILTER : public XOBJECT { /* Filter description block */
PVAL
&
Val
(
int
i
)
{
return
Test
[
i
].
Value
;}
bool
&
Conv
(
int
i
)
{
return
Test
[
i
].
Conv
;}
void
SetNext
(
PFIL
filp
)
{
Next
=
filp
;}
bool
MakeSelector
(
PGLOBAL
g
,
PSTRG
s
);
// Methods
virtual
void
Reset
(
void
);
...
...
storage/connect/jmgoconn.cpp
View file @
5fe0087a
...
...
@@ -272,7 +272,7 @@ bool JMgoConn::MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
if
(
MakeSelector
(
g
,
filp
,
s
))
{
strcpy
(
g
->
Message
,
"Failed making selector"
);
return
NULL
;
return
true
;
}
else
s
->
Append
(
'}'
);
...
...
@@ -340,7 +340,7 @@ bool JMgoConn::MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
if
(
MakeSelector
(
g
,
filp
,
s
))
{
strcpy
(
g
->
Message
,
"Failed making selector"
);
return
NULL
;
return
true
;
}
// endif Selector
tdbp
->
SetFilter
(
NULL
);
// Not needed anymore
...
...
storage/connect/mycat.cc
View file @
5fe0087a
...
...
@@ -545,15 +545,6 @@ PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am)
case
TAB_PIVOT
:
tdp
=
new
(
g
)
PIVOTDEF
;
break
;
case
TAB_VIR
:
tdp
=
new
(
g
)
VIRDEF
;
break
;
case
TAB_JSON
:
tdp
=
new
(
g
)
JSONDEF
;
break
;
#if defined(MONGO_SUPPORT)
case
TAB_MONGO
:
// if (MongoEnabled())
tdp
=
new
(
g
)
MGODEF
;
// else
// strcpy(g->Message, "MONGO type not enabled");
break
;
#endif // MONGO_SUPPORT
#if defined(ZIP_SUPPORT)
case
TAB_ZIP
:
tdp
=
new
(
g
)
ZIPDEF
;
break
;
#endif // ZIP_SUPPORT
...
...
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