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
2445b1b2
Commit
2445b1b2
authored
Oct 20, 2015
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Typo
parent
7cd9af69
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+6
-3
No files found.
storage/connect/ha_connect.cc
View file @
2445b1b2
...
@@ -169,7 +169,7 @@
...
@@ -169,7 +169,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.04.0003
September 15
, 2015"
;
char
version
[]
=
"Version 1.04.0003
October 20
, 2015"
;
#if defined(__WIN__)
#if defined(__WIN__)
char
compver
[]
=
"Version 1.04.0003 "
__DATE__
" "
__TIME__
;
char
compver
[]
=
"Version 1.04.0003 "
__DATE__
" "
__TIME__
;
char
slash
=
'\\'
;
char
slash
=
'\\'
;
...
@@ -1134,7 +1134,10 @@ PTOS ha_connect::GetTableOptionStruct(TABLE_SHARE *s)
...
@@ -1134,7 +1134,10 @@ PTOS ha_connect::GetTableOptionStruct(TABLE_SHARE *s)
{
{
TABLE_SHARE
*
tsp
=
(
tshp
)
?
tshp
:
(
s
)
?
s
:
table_share
;
TABLE_SHARE
*
tsp
=
(
tshp
)
?
tshp
:
(
s
)
?
s
:
table_share
;
return
(
tsp
)
?
tsp
->
option_struct
:
NULL
;
return
(
tsp
&&
(
!
tsp
->
db_plugin
||
!
stricmp
(
plugin_name
(
tsp
->
db_plugin
)
->
str
,
"connect"
)
||
!
stricmp
(
plugin_name
(
tsp
->
db_plugin
)
->
str
,
"partition"
)))
?
tsp
->
option_struct
:
NULL
;
}
// end of GetTableOptionStruct
}
// end of GetTableOptionStruct
/****************************************************************************/
/****************************************************************************/
...
@@ -2529,7 +2532,7 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
...
@@ -2529,7 +2532,7 @@ PFIL ha_connect::CondFilter(PGLOBAL g, Item *cond)
!
(
colp
[
i
]
=
tdbp
->
ColDB
(
g
,
(
PSZ
)
pField
->
field
->
field_name
,
0
)))
!
(
colp
[
i
]
=
tdbp
->
ColDB
(
g
,
(
PSZ
)
pField
->
field
->
field_name
,
0
)))
return
NULL
;
// Column does not belong to this table
return
NULL
;
// Column does not belong to this table
// These are not yet implemented (buggy)
// These
types
are not yet implemented (buggy)
switch
(
pField
->
field
->
type
())
{
switch
(
pField
->
field
->
type
())
{
case
MYSQL_TYPE_TIMESTAMP
:
case
MYSQL_TYPE_TIMESTAMP
:
case
MYSQL_TYPE_DATE
:
case
MYSQL_TYPE_DATE
:
...
...
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