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
1d411a8a
Commit
1d411a8a
authored
May 10, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'connect/10.2' into 10.2
parents
9b1824dc
0138220f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
24 deletions
+15
-24
storage/connect/domdoc.cpp
storage/connect/domdoc.cpp
+2
-2
storage/connect/filamtxt.cpp
storage/connect/filamtxt.cpp
+1
-1
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+4
-8
storage/connect/jsonudf.cpp
storage/connect/jsonudf.cpp
+1
-1
storage/connect/mycat.cc
storage/connect/mycat.cc
+4
-11
storage/connect/tabext.cpp
storage/connect/tabext.cpp
+1
-1
storage/connect/tabjson.h
storage/connect/tabjson.h
+1
-0
storage/connect/user_connect.cc
storage/connect/user_connect.cc
+1
-0
No files found.
storage/connect/domdoc.cpp
View file @
1d411a8a
...
...
@@ -84,8 +84,8 @@ DOMDOC::DOMDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp)
:
XMLDOCUMENT
(
nsl
,
nsdf
,
enc
)
{
assert
(
!
fp
||
fp
->
Type
==
TYPE_FB_XML
);
Docp
=
(
fp
)
?
((
PXBLOCK
)
fp
)
->
Docp
:
NULL
;
Nlist
=
NULL
;
Docp
=
(
fp
)
?
((
PXBLOCK
)
fp
)
->
Docp
:
(
MSXML2
::
IXMLDOMDocumentPtr
)
NULL
;
Nlist
=
NULL
;
Hr
=
0
;
}
// end of DOMDOC constructor
...
...
storage/connect/filamtxt.cpp
View file @
1d411a8a
...
...
@@ -427,7 +427,7 @@ int TXTFAM::DeleteSortedRows(PGLOBAL g)
for
(
i
=
0
;
i
<
Posar
->
GetNval
();
i
++
)
{
if
((
irc
=
InitDelete
(
g
,
Posar
->
GetIntValue
(
ix
[
i
]),
Sosar
->
GetIntValue
(
ix
[
i
]))
==
RC_FX
)
)
Sosar
->
GetIntValue
(
ix
[
i
]))
)
==
RC_FX
)
goto
err
;
// Now delete the sorted rows
...
...
storage/connect/ha_connect.cc
View file @
1d411a8a
...
...
@@ -107,13 +107,9 @@
#define MYSQL_SERVER 1
#define DONT_DEFINE_VOID
#include "sql_class.h"
#include "create_options.h"
#include "mysql_com.h"
#include "field.h"
#include <my_global.h>
#include "sql_parse.h"
#include "sql_base.h"
#include <sys/stat.h>
#include "sql_partition.h"
#undef OFFSET
...
...
@@ -432,7 +428,7 @@ handlerton *connect_hton= NULL;
uint
GetTraceValue
(
void
)
{
return
(
uint
)(
connect_hton
?
THDVAR
(
current_thd
,
xtrace
)
:
0
);}
bool
ExactInfo
(
void
)
{
return
THDVAR
(
current_thd
,
exact_info
);}
bool
CondPushEnabled
(
void
)
{
return
THDVAR
(
current_thd
,
cond_push
);}
static
bool
CondPushEnabled
(
void
)
{
return
THDVAR
(
current_thd
,
cond_push
);}
USETEMP
UseTemp
(
void
)
{
return
(
USETEMP
)
THDVAR
(
current_thd
,
use_tempfile
);}
int
GetConvSize
(
void
)
{
return
THDVAR
(
current_thd
,
conv_size
);}
TYPCONV
GetTypeConv
(
void
)
{
return
(
TYPCONV
)
THDVAR
(
current_thd
,
type_conv
);}
...
...
@@ -2813,7 +2809,7 @@ PCFIL ha_connect::CheckCond(PGLOBAL g, PCFIL filp, const Item *cond)
htrc
(
"Cond type=%d
\n
"
,
cond
->
type
());
if
(
cond
->
type
()
==
COND
::
COND_ITEM
)
{
char
*
pb0
,
*
pb1
,
*
pb2
,
*
ph0
,
*
ph1
,
*
ph2
;
char
*
pb0
,
*
pb1
,
*
pb2
,
*
ph0
=
0
,
*
ph1
=
0
,
*
ph2
=
0
;
bool
bb
=
false
,
bh
=
false
;
Item_cond
*
cond_item
=
(
Item_cond
*
)
cond
;
...
...
@@ -5570,7 +5566,7 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
}
// endif p
}
else
if
(
ttp
!=
TAB_ODBC
||
!
(
fnc
&
(
FNC_TABLE
|
FNC_COL
)))
tab
=
table_s
->
table_name
.
str
;
// Default value
tab
=
(
char
*
)
table_s
->
table_name
.
str
;
// Default value
}
// endif tab
...
...
storage/connect/jsonudf.cpp
View file @
1d411a8a
...
...
@@ -1620,7 +1620,7 @@ static my_bool CheckMemory(PGLOBAL g, UDF_INIT *initid, UDF_ARGS *args, uint n,
if
(
AllocSarea
(
g
,
ml
))
{
char
errmsg
[
MAX_STR
];
snprintf
(
errmsg
,
sizeof
(
errmsg
)
-
1
,
MSG
(
WORK_AREA
),
g
->
Message
);
snprintf
(
errmsg
,
sizeof
(
errmsg
)
-
1
,
MSG
(
WORK_AREA
),
g
->
Message
);
strcpy
(
g
->
Message
,
errmsg
);
return
true
;
}
// endif SareaAlloc
...
...
storage/connect/mycat.cc
View file @
1d411a8a
...
...
@@ -18,7 +18,7 @@
/* ------------- */
/* Version 1.6 */
/* */
/* Author: Olivier Bertrand 2012 - 201
7
*/
/* Author: Olivier Bertrand 2012 - 201
8
*/
/* */
/* WHAT THIS PROGRAM DOES: */
/* ----------------------- */
...
...
@@ -28,20 +28,13 @@
/***********************************************************************/
/* Include relevant MariaDB header file. */
/***********************************************************************/
#include <my_config.h>
#define DONT_DEFINE_VOID
#include <my_global.h>
#if defined(__WIN__)
//#include <windows.h>
//#include <sqlext.h>
#elif defined(UNIX)
#include <sys/types.h>
#if defined(UNIX)
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#endif
#define DONT_DEFINE_VOID
//#include <mysql/plugin.h>
#include "handler.h"
#undef OFFSET
...
...
storage/connect/tabext.cpp
View file @
1d411a8a
...
...
@@ -286,7 +286,7 @@ bool TDBEXT::MakeSrcdef(PGLOBAL g)
char
*
catp
=
strstr
(
Srcdef
,
"%s"
);
if
(
catp
)
{
char
*
fil1
,
*
fil2
;
char
*
fil1
=
0
,
*
fil2
;
PCSZ
ph
=
((
EXTDEF
*
)
To_Def
)
->
Phpos
;
if
(
!
ph
)
...
...
storage/connect/tabjson.h
View file @
1d411a8a
...
...
@@ -16,6 +16,7 @@ typedef class JSONDEF *PJDEF;
typedef
class
TDBJSON
*
PJTDB
;
typedef
class
JSONCOL
*
PJCOL
;
class
TDBJSN
;
PQRYRES
JSONColumns
(
PGLOBAL
g
,
PCSZ
db
,
PCSZ
dsn
,
PTOS
topt
,
bool
info
);
/***********************************************************************/
/* The JSON tree node. Can be an Object or an Array. */
...
...
storage/connect/user_connect.cc
View file @
1d411a8a
...
...
@@ -36,6 +36,7 @@
#define DONT_DEFINE_VOID
#define MYSQL_SERVER
#include <my_global.h>
#include "sql_class.h"
#undef OFFSET
...
...
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