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
f774c33a
Commit
f774c33a
authored
Jun 20, 2022
by
Yusuke Abe
Committed by
GitHub
Jun 20, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-27809 Spider: remove #ifdef SPIDER_I_S_USE_SHOW_FOR_COLUMN
Reviewed by: Nayuta Yanagisawa
parent
0aadb58e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
34 deletions
+0
-34
storage/spider/spd_environ.h
storage/spider/spd_environ.h
+0
-1
storage/spider/spd_i_s.cc
storage/spider/spd_i_s.cc
+0
-33
No files found.
storage/spider/spd_environ.h
View file @
f774c33a
...
...
@@ -26,5 +26,4 @@
#define HA_EXTRA_HAS_STARTING_ORDERED_INDEX_SCAN
#define HANDLER_HAS_CAN_USE_FOR_AUTO_INC_INIT
#define SPIDER_UPDATE_ROW_HAS_CONST_NEW_DATA
#define SPIDER_I_S_USE_SHOW_FOR_COLUMN
#endif
/* SPD_ENVIRON_INCLUDED */
storage/spider/spd_i_s.cc
View file @
f774c33a
...
...
@@ -41,7 +41,6 @@ static struct st_mysql_storage_engine spider_i_s_info =
{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION
};
namespace
Show
{
#ifdef SPIDER_I_S_USE_SHOW_FOR_COLUMN
static
ST_FIELD_INFO
spider_i_s_alloc_mem_fields_info
[]
=
{
Column
(
"ID"
,
ULong
(
10
),
NOT_NULL
,
"id"
),
...
...
@@ -54,27 +53,6 @@ static ST_FIELD_INFO spider_i_s_alloc_mem_fields_info[] =
Column
(
"FREE_MEM_COUNT"
,
ULonglong
(
20
),
NULLABLE
,
"free_mem_count"
),
CEnd
()
};
#else
static
ST_FIELD_INFO
spider_i_s_alloc_mem_fields_info
[]
=
{
{
"ID"
,
10
,
MYSQL_TYPE_LONG
,
0
,
MY_I_S_UNSIGNED
,
"id"
,
SKIP_OPEN_TABLE
},
{
"FUNC_NAME"
,
64
,
MYSQL_TYPE_STRING
,
0
,
MY_I_S_MAYBE_NULL
,
"func_name"
,
SKIP_OPEN_TABLE
},
{
"FILE_NAME"
,
64
,
MYSQL_TYPE_STRING
,
0
,
MY_I_S_MAYBE_NULL
,
"file_name"
,
SKIP_OPEN_TABLE
},
{
"LINE_NO"
,
10
,
MYSQL_TYPE_LONG
,
0
,
MY_I_S_UNSIGNED
|
MY_I_S_MAYBE_NULL
,
"line_no"
,
SKIP_OPEN_TABLE
},
{
"TOTAL_ALLOC_MEM"
,
20
,
MYSQL_TYPE_LONGLONG
,
0
,
MY_I_S_UNSIGNED
|
MY_I_S_MAYBE_NULL
,
"total_alloc_mem"
,
SKIP_OPEN_TABLE
},
{
"CURRENT_ALLOC_MEM"
,
20
,
MYSQL_TYPE_LONGLONG
,
0
,
MY_I_S_MAYBE_NULL
,
"current_alloc_mem"
,
SKIP_OPEN_TABLE
},
{
"ALLOC_MEM_COUNT"
,
20
,
MYSQL_TYPE_LONGLONG
,
0
,
MY_I_S_UNSIGNED
|
MY_I_S_MAYBE_NULL
,
"alloc_mem_count"
,
SKIP_OPEN_TABLE
},
{
"FREE_MEM_COUNT"
,
20
,
MYSQL_TYPE_LONGLONG
,
0
,
MY_I_S_UNSIGNED
|
MY_I_S_MAYBE_NULL
,
"free_mem_count"
,
SKIP_OPEN_TABLE
},
{
NULL
,
0
,
MYSQL_TYPE_STRING
,
0
,
0
,
NULL
,
0
}
};
#endif
}
// namespace Show
static
int
spider_i_s_alloc_mem_fill_table
(
...
...
@@ -180,7 +158,6 @@ struct st_maria_plugin spider_i_s_alloc_mem_maria =
extern
SPIDER_DBTON
spider_dbton
[
SPIDER_DBTON_SIZE
];
namespace
Show
{
#ifdef SPIDER_I_S_USE_SHOW_FOR_COLUMN
static
ST_FIELD_INFO
spider_i_s_wrapper_protocols_fields_info
[]
=
{
Column
(
"WRAPPER_NAME"
,
Varchar
(
NAME_CHAR_LEN
),
NOT_NULL
,
""
),
...
...
@@ -189,16 +166,6 @@ static ST_FIELD_INFO spider_i_s_wrapper_protocols_fields_info[] =
Column
(
"WRAPPER_MATURITY"
,
Varchar
(
12
),
NOT_NULL
,
""
),
CEnd
()
};
#else
static
ST_FIELD_INFO
spider_i_s_wrapper_protocols_fields_info
[]
=
{
{
"WRAPPER_NAME"
,
NAME_CHAR_LEN
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
,
SKIP_OPEN_TABLE
},
{
"WRAPPER_VERSION"
,
20
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
,
SKIP_OPEN_TABLE
},
{
"WRAPPER_DESCRIPTION"
,
65535
,
MYSQL_TYPE_STRING
,
0
,
1
,
0
,
SKIP_OPEN_TABLE
},
{
"WRAPPER_MATURITY"
,
12
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
,
SKIP_OPEN_TABLE
},
{
0
,
0
,
MYSQL_TYPE_STRING
,
0
,
0
,
0
,
0
}
};
#endif
}
// namespace Show
static
int
spider_i_s_wrapper_protocols_fill_table
(
...
...
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