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
7d439334
Commit
7d439334
authored
Dec 01, 2020
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failed compile modified storage/connect/ha_connect.cc and mycat.cc
parent
4e8af8a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+8
-8
storage/connect/mycat.cc
storage/connect/mycat.cc
+4
-4
No files found.
storage/connect/ha_connect.cc
View file @
7d439334
...
@@ -170,7 +170,7 @@
...
@@ -170,7 +170,7 @@
#define JSONMAX 10 // JSON Default max grp size
#define JSONMAX 10 // JSON Default max grp size
extern
"C"
{
extern
"C"
{
char
version
[]
=
"Version 1.07.0002
November 30
, 2020"
;
char
version
[]
=
"Version 1.07.0002
December 01
, 2020"
;
#if defined(__WIN__)
#if defined(__WIN__)
char
compver
[]
=
"Version 1.07.0002 "
__DATE__
" "
__TIME__
;
char
compver
[]
=
"Version 1.07.0002 "
__DATE__
" "
__TIME__
;
char
slash
=
'\\'
;
char
slash
=
'\\'
;
...
@@ -4516,7 +4516,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick)
...
@@ -4516,7 +4516,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options, char *dbn, bool quick)
case
TAB_VEC
:
case
TAB_VEC
:
case
TAB_REST
:
case
TAB_REST
:
case
TAB_JSON
:
case
TAB_JSON
:
#if defined
DEVELOPMENT
#if defined
(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif // DEVELOPMENT
#endif // DEVELOPMENT
if
(
options
->
filename
&&
*
options
->
filename
)
{
if
(
options
->
filename
&&
*
options
->
filename
)
{
...
@@ -5685,9 +5685,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
...
@@ -5685,9 +5685,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
}
else
if
(
topt
->
http
)
{
}
else
if
(
topt
->
http
)
{
switch
(
ttp
)
{
switch
(
ttp
)
{
case
TAB_JSON
:
case
TAB_JSON
:
#if
def DEVELOPMENT
#if
defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif // DEVELOPMENT
#endif
// DEVELOPMENT
case
TAB_XML
:
case
TAB_XML
:
case
TAB_CSV
:
case
TAB_CSV
:
ttp
=
TAB_REST
;
ttp
=
TAB_REST
;
...
@@ -5872,9 +5872,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
...
@@ -5872,9 +5872,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
case
TAB_XML
:
case
TAB_XML
:
#endif // LIBXML2_SUPPORT || DOMDOC_SUPPORT
#endif // LIBXML2_SUPPORT || DOMDOC_SUPPORT
case
TAB_JSON
:
case
TAB_JSON
:
#if
def DEVELOPMENT
#if
defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif // DEVELOPMENT
#endif
// DEVELOPMENT
dsn
=
strz
(
g
,
create_info
->
connect_string
);
dsn
=
strz
(
g
,
create_info
->
connect_string
);
if
(
!
fn
&&
!
zfn
&&
!
mul
&&
!
dsn
)
if
(
!
fn
&&
!
zfn
&&
!
mul
&&
!
dsn
)
...
@@ -6041,11 +6041,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
...
@@ -6041,11 +6041,11 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
case
TAB_JSON
:
case
TAB_JSON
:
qrp
=
JSONColumns
(
g
,
db
,
dsn
,
topt
,
fnc
==
FNC_COL
);
qrp
=
JSONColumns
(
g
,
db
,
dsn
,
topt
,
fnc
==
FNC_COL
);
break
;
break
;
#if
def DEVELOPMENT
#if
defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
qrp
=
BSONColumns
(
g
,
db
,
dsn
,
topt
,
fnc
==
FNC_COL
);
qrp
=
BSONColumns
(
g
,
db
,
dsn
,
topt
,
fnc
==
FNC_COL
);
break
;
break
;
#endif // DEVELOPMENT
#endif
// DEVELOPMENT
#if defined(JAVA_SUPPORT)
#if defined(JAVA_SUPPORT)
case
TAB_MONGO
:
case
TAB_MONGO
:
url
=
strz
(
g
,
create_info
->
connect_string
);
url
=
strz
(
g
,
create_info
->
connect_string
);
...
...
storage/connect/mycat.cc
View file @
7d439334
...
@@ -190,7 +190,7 @@ bool IsFileType(TABTYPE type)
...
@@ -190,7 +190,7 @@ bool IsFileType(TABTYPE type)
case
TAB_JSON
:
case
TAB_JSON
:
#if defined(DEVELOPMENT)
#if defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif
#endif
// DEVELOPMENT
case
TAB_REST
:
case
TAB_REST
:
// case TAB_ZIP:
// case TAB_ZIP:
isfile
=
true
;
isfile
=
true
;
...
@@ -288,7 +288,7 @@ bool IsTypeIndexable(TABTYPE type)
...
@@ -288,7 +288,7 @@ bool IsTypeIndexable(TABTYPE type)
case
TAB_JSON
:
case
TAB_JSON
:
#if defined(DEVELOPMENT)
#if defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif
#endif
// DEVELOPMENT
idx
=
true
;
idx
=
true
;
break
;
break
;
default:
default:
...
@@ -317,7 +317,7 @@ int GetIndexType(TABTYPE type)
...
@@ -317,7 +317,7 @@ int GetIndexType(TABTYPE type)
case
TAB_JSON
:
case
TAB_JSON
:
#if defined(DEVELOPMENT)
#if defined(DEVELOPMENT)
case
TAB_BSON
:
case
TAB_BSON
:
#endif
#endif
// DEVELOPMENT
xtyp
=
1
;
xtyp
=
1
;
break
;
break
;
case
TAB_MYSQL
:
case
TAB_MYSQL
:
...
@@ -484,7 +484,7 @@ PTABDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am)
...
@@ -484,7 +484,7 @@ PTABDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am)
case
TAB_JSON
:
tdp
=
new
(
g
)
JSONDEF
;
break
;
case
TAB_JSON
:
tdp
=
new
(
g
)
JSONDEF
;
break
;
#if defined(DEVELOPMENT)
#if defined(DEVELOPMENT)
case
TAB_BSON
:
tdp
=
new
(
g
)
BSONDEF
;
break
;
case
TAB_BSON
:
tdp
=
new
(
g
)
BSONDEF
;
break
;
#endif
#endif
// DEVELOPMENT
#if defined(ZIP_SUPPORT)
#if defined(ZIP_SUPPORT)
case
TAB_ZIP
:
tdp
=
new
(
g
)
ZIPDEF
;
break
;
case
TAB_ZIP
:
tdp
=
new
(
g
)
ZIPDEF
;
break
;
#endif // ZIP_SUPPORT
#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