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
49f95c40
Commit
49f95c40
authored
Aug 23, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.5 into 10.6
parents
75c641d2
2c9f2a4c
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
565 additions
and
474 deletions
+565
-474
debian/autobake-deb.sh
debian/autobake-deb.sh
+6
-3
debian/mariadb-server-10.6.postinst
debian/mariadb-server-10.6.postinst
+3
-6
debian/rules
debian/rules
+0
-9
extra/mariabackup/backup_mysql.cc
extra/mariabackup/backup_mysql.cc
+0
-2
mysql-test/main/thread_pool_info.opt
mysql-test/main/thread_pool_info.opt
+1
-1
mysql-test/main/thread_pool_info.result
mysql-test/main/thread_pool_info.result
+32
-10
mysql-test/main/thread_pool_info.test
mysql-test/main/thread_pool_info.test
+55
-4
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
+10
-0
mysql-test/suite/innodb/t/innodb-alter-timestamp.test
mysql-test/suite/innodb/t/innodb-alter-timestamp.test
+12
-0
plugin/auth_pam/CMakeLists.txt
plugin/auth_pam/CMakeLists.txt
+3
-0
sql/table.h
sql/table.h
+1
-1
sql/thread_pool_info.cc
sql/thread_pool_info.cc
+3
-0
sql/threadpool_generic.cc
sql/threadpool_generic.cc
+1
-1
storage/innobase/btr/btr0sea.cc
storage/innobase/btr/btr0sea.cc
+8
-1
storage/innobase/dict/dict0dict.cc
storage/innobase/dict/dict0dict.cc
+20
-9
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/handler0alter.cc
+1
-0
storage/innobase/handler/i_s.cc
storage/innobase/handler/i_s.cc
+404
-406
storage/innobase/handler/i_s.h
storage/innobase/handler/i_s.h
+1
-11
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0mem.h
+3
-3
storage/innobase/innodb.cmake
storage/innobase/innodb.cmake
+0
-5
storage/mroonga/CMakeLists.txt
storage/mroonga/CMakeLists.txt
+1
-2
No files found.
debian/autobake-deb.sh
View file @
49f95c40
...
@@ -24,10 +24,13 @@ then
...
@@ -24,10 +24,13 @@ then
# build less verbose
# build less verbose
# MCOL-4149: ColumnStore builds are so slow and big that they must be skipped on
# MCOL-4149: ColumnStore builds are so slow and big that they must be skipped on
# both Travis-CI and Gitlab-CI
# both Travis-CI and Gitlab-CI
sed
-e
'/Add support for verbose builds/,/^$/d'
\
sed
-e
's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|'
\
-e
'/ColumnStore is part of the build/,/^$/d'
\
-e
's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|'
\
-i
debian/rules
-i
debian/rules
elif
[
-d
storage/columnstore/columnstore/debian
]
then
cp
-v
storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.
*
debian/
echo
>>
debian/control
cat
storage/columnstore/columnstore/debian/control
>>
debian/control
fi
fi
# Don't build or try to put files in a package for selected plugins and components on Travis-CI
# Don't build or try to put files in a package for selected plugins and components on Travis-CI
...
...
debian/mariadb-server-10.6.postinst
View file @
49f95c40
...
@@ -124,7 +124,7 @@ EOF
...
@@ -124,7 +124,7 @@ EOF
if
[
!
-d
"
$mysql_datadir
"
]
&&
[
!
-L
"
$mysql_datadir
"
]
;
then
mkdir
-Z
"
$mysql_datadir
"
;
fi
if
[
!
-d
"
$mysql_datadir
"
]
&&
[
!
-L
"
$mysql_datadir
"
]
;
then
mkdir
-Z
"
$mysql_datadir
"
;
fi
if
[
!
-d
"
$mysql_logdir
"
]
&&
[
!
-L
"
$mysql_logdir
"
]
;
then
mkdir
-Z
"
$mysql_logdir
"
;
fi
if
[
!
-d
"
$mysql_logdir
"
]
&&
[
!
-L
"
$mysql_logdir
"
]
;
then
mkdir
-Z
"
$mysql_logdir
"
;
fi
# When creating an ext3 jounal on an already mounted filesystem like e.g.
# When creating an ext3 jounal on an already mounted filesystem like e.g.
# /var/lib/mysql, you get a .journal file that is not modif
y
able by chown.
# /var/lib/mysql, you get a .journal file that is not modif
i
able by chown.
# The mysql_statedir must not be writable by the mysql user under any
# The mysql_statedir must not be writable by the mysql user under any
# circumstances as it contains scripts that are executed by root.
# circumstances as it contains scripts that are executed by root.
set
+e
set
+e
...
@@ -161,7 +161,7 @@ EOF
...
@@ -161,7 +161,7 @@ EOF
# Clean up old flags before setting new one
# Clean up old flags before setting new one
rm
-f
$mysql_datadir
/debian-
*
.flag
rm
-f
$mysql_datadir
/debian-
*
.flag
# Flag data dir to avoid downgrades
# Flag data dir to avoid downgrades
touch
"
$mysql_datadir
/debian-
$MAJOR_VER
.flag"
touch
$mysql_datadir
/debian-10.6.flag
# initiate databases. Output is not allowed by debconf :-(
# initiate databases. Output is not allowed by debconf :-(
# This will fail if we are upgrading an existing database; in this case
# This will fail if we are upgrading an existing database; in this case
...
@@ -175,9 +175,6 @@ EOF
...
@@ -175,9 +175,6 @@ EOF
$ERR_LOGGER
$ERR_LOGGER
set
-e
set
-e
# To avoid downgrades.
touch
"
$mysql_statedir
/debian-
$MAJOR_VER
.flag"
# On new installations root user can connect via unix_socket.
# On new installations root user can connect via unix_socket.
# But on upgrades, scripts rely on debian-sys-maint user and
# But on upgrades, scripts rely on debian-sys-maint user and
# credentials in /etc/mysql/debian.cnf
# credentials in /etc/mysql/debian.cnf
...
@@ -251,7 +248,7 @@ EOF
...
@@ -251,7 +248,7 @@ EOF
;;
;;
esac
esac
db_stop
# in case invoke fail
e
s
db_stop
# in case invoke fails
# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mariadb.
# dh_systemd_start doesn't emit anything since we still ship /etc/init.d/mariadb.
# Thus MariaDB server is started via init.d script, which in turn redirects to
# Thus MariaDB server is started via init.d script, which in turn redirects to
...
...
debian/rules
View file @
49f95c40
...
@@ -73,15 +73,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
...
@@ -73,15 +73,6 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
dh_auto_build --builddirectory=builddir-native -- import_executables
dh_auto_build --builddirectory=builddir-native -- import_executables
endif
endif
# ColumnStore is part of the build
ifneq (32,$(DEB_HOST_ARCH_BITS))
# Take the files and part of control from MCS directory
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
# Don't include twice
grep -q '^Package: mariadb-plugin-columnstore$$' debian/control || \
( echo && cat storage/columnstore/columnstore/debian/control ) >> debian/control
endif
echo "server:Version=$(DEB_VERSION)" >> debian/substvars
echo "server:Version=$(DEB_VERSION)" >> debian/substvars
# RocksDB and Column Store cannot build on 32-bit platforms
# RocksDB and Column Store cannot build on 32-bit platforms
...
...
extra/mariabackup/backup_mysql.cc
View file @
49f95c40
...
@@ -922,8 +922,6 @@ bool lock_tables(MYSQL *connection)
...
@@ -922,8 +922,6 @@ bool lock_tables(MYSQL *connection)
xb_mysql_query
(
connection
,
"BACKUP STAGE START"
,
true
);
xb_mysql_query
(
connection
,
"BACKUP STAGE START"
,
true
);
DBUG_MARIABACKUP_EVENT
(
"after_backup_stage_start"
,
{});
DBUG_MARIABACKUP_EVENT
(
"after_backup_stage_start"
,
{});
// xb_mysql_query(connection, "BACKUP STAGE FLUSH", true);
// xb_mysql_query(connection, "BACKUP STAGE BLOCK_DDL", true);
xb_mysql_query
(
connection
,
"BACKUP STAGE BLOCK_COMMIT"
,
true
);
xb_mysql_query
(
connection
,
"BACKUP STAGE BLOCK_COMMIT"
,
true
);
DBUG_MARIABACKUP_EVENT
(
"after_backup_stage_block_commit"
,
{});
DBUG_MARIABACKUP_EVENT
(
"after_backup_stage_block_commit"
,
{});
/* Set the maximum supported session value for
/* Set the maximum supported session value for
...
...
mysql-test/main/thread_pool_info.opt
View file @
49f95c40
--thread-handling=pool-of-threads --loose-thread-pool-mode=generic --loose-thread-pool-groups=ON --loose-thread-pool-queues=ON --thread-pool-stats=ON --thread-pool-waits=ON
--thread-handling=pool-of-threads --loose-thread-pool-mode=generic --loose-thread-pool-groups=ON --loose-thread-pool-queues=ON --thread-pool-stats=ON --thread-pool-waits=ON --thread-pool-size=1 --thread-pool-max-threads=2 --thread-pool-dedicated-listener
\ No newline at end of file
mysql-test/main/thread_pool_info.result
View file @
49f95c40
...
@@ -26,13 +26,6 @@ SUM(QUEUE_LENGTH)
...
@@ -26,13 +26,6 @@ SUM(QUEUE_LENGTH)
SELECT SUM(IS_STALLED) FROM INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
SELECT SUM(IS_STALLED) FROM INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
SUM(IS_STALLED)
SUM(IS_STALLED)
0
0
DESC INFORMATION_SCHEMA.THREAD_POOL_QUEUES;
Field Type Null Key Default Extra
GROUP_ID int(6) NO 0
POSITION int(6) NO 0
PRIORITY int(1) NO 0
CONNECTION_ID bigint(19) unsigned YES NULL
QUEUEING_TIME_MICROSECONDS bigint(19) NO 0
DESC INFORMATION_SCHEMA.THREAD_POOL_STATS;
DESC INFORMATION_SCHEMA.THREAD_POOL_STATS;
Field Type Null Key Default Extra
Field Type Null Key Default Extra
GROUP_ID int(6) NO 0
GROUP_ID int(6) NO 0
...
@@ -56,9 +49,12 @@ FLUSH THREAD_POOL_STATS;
...
@@ -56,9 +49,12 @@ FLUSH THREAD_POOL_STATS;
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SELECT SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER)
SUM(DEQUEUES_BY_LISTENER+DEQUEUES_BY_WORKER)
1
1
SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3 FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SELECT SUM(POLLS_BY_LISTENER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) BETWEEN 2 AND 3
SUM(POLLS_BY_LISTENER)
1
2
SELECT SUM(POLLS_BY_WORKER) FROM INFORMATION_SCHEMA.THREAD_POOL_STATS;
SUM(POLLS_BY_WORKER)
0
DESC INFORMATION_SCHEMA.THREAD_POOL_WAITS;
DESC INFORMATION_SCHEMA.THREAD_POOL_WAITS;
Field Type Null Key Default Extra
Field Type Null Key Default Extra
REASON varchar(16) NO
REASON varchar(16) NO
...
@@ -87,3 +83,29 @@ SELECT COUNT FROM INFORMATION_SCHEMA.THREAD_POOL_WAITS WHERE REASON='Sleep';
...
@@ -87,3 +83,29 @@ SELECT COUNT FROM INFORMATION_SCHEMA.THREAD_POOL_WAITS WHERE REASON='Sleep';
COUNT
COUNT
1
1
FLUSH THREAD_POOL_WAITS;
FLUSH THREAD_POOL_WAITS;
DESC INFORMATION_SCHEMA.THREAD_POOL_QUEUES;
Field Type Null Key Default Extra
GROUP_ID int(6) NO 0
POSITION int(6) NO 0
PRIORITY int(1) NO 0
CONNECTION_ID bigint(19) unsigned YES NULL
QUEUEING_TIME_MICROSECONDS bigint(19) NO 0
# restart: with restart_parameters
connect con1, localhost, root,,test;
connection con1;
connect con2, localhost, root,,test;
connection con2;
connect extra_con,127.0.0.1,root,,test,$extra_port,;
connection con1;
SELECT SLEEP(1000);
connection extra_con;
connection con2;
DO 1;
connection extra_con;
KILL QUERY con1_id;
disconnect extra_con;
connection con1;
disconnect con1;
connection con2;
disconnect con2;
connection default;
mysql-test/main/thread_pool_info.test
View file @
49f95c40
...
@@ -15,9 +15,6 @@ SELECT SUM(ACTIVE_THREADS) > 0 FROM INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
...
@@ -15,9 +15,6 @@ SELECT SUM(ACTIVE_THREADS) > 0 FROM INFORMATION_SCHEMA.THREAD_POOL_GROUPS;
SELECT
SUM
(
QUEUE_LENGTH
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_GROUPS
;
SELECT
SUM
(
QUEUE_LENGTH
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_GROUPS
;
SELECT
SUM
(
IS_STALLED
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_GROUPS
;
SELECT
SUM
(
IS_STALLED
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_GROUPS
;
# I_S.THREAD_POOL_QUEUES
DESC
INFORMATION_SCHEMA
.
THREAD_POOL_QUEUES
;
#Todo - figure out how to populate queue with debug test
# I_S.THREAD_POOL_STATS
# I_S.THREAD_POOL_STATS
DESC
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
DESC
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
...
@@ -29,7 +26,8 @@ SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) > 0 FROM INFORMATION_SCHEMA.THREAD
...
@@ -29,7 +26,8 @@ SELECT SUM(POLLS_BY_LISTENER+POLLS_BY_WORKER) > 0 FROM INFORMATION_SCHEMA.THREAD
--
disable_ps_protocol
--
disable_ps_protocol
FLUSH
THREAD_POOL_STATS
;
FLUSH
THREAD_POOL_STATS
;
SELECT
SUM
(
DEQUEUES_BY_LISTENER
+
DEQUEUES_BY_WORKER
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
SELECT
SUM
(
DEQUEUES_BY_LISTENER
+
DEQUEUES_BY_WORKER
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
SELECT
SUM
(
POLLS_BY_LISTENER
+
POLLS_BY_WORKER
)
BETWEEN
2
AND
3
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
SELECT
SUM
(
POLLS_BY_LISTENER
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
SELECT
SUM
(
POLLS_BY_WORKER
)
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_STATS
;
--
enable_ps_protocol
--
enable_ps_protocol
#I_S.THREAD_POOL_WAITS
#I_S.THREAD_POOL_WAITS
...
@@ -39,3 +37,56 @@ SELECT COUNT FROM INFORMATION_SCHEMA.THREAD_POOL_WAITS WHERE REASON='Sleep';
...
@@ -39,3 +37,56 @@ SELECT COUNT FROM INFORMATION_SCHEMA.THREAD_POOL_WAITS WHERE REASON='Sleep';
SELECT
SLEEP
(
0.01
);
SELECT
SLEEP
(
0.01
);
SELECT
COUNT
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_WAITS
WHERE
REASON
=
'Sleep'
;
SELECT
COUNT
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_WAITS
WHERE
REASON
=
'Sleep'
;
FLUSH
THREAD_POOL_WAITS
;
FLUSH
THREAD_POOL_WAITS
;
# I_S.THREAD_POOL_QUEUES
DESC
INFORMATION_SCHEMA
.
THREAD_POOL_QUEUES
;
let
$extra_port
=
`select @@port+1`
;
let
$restart_parameters
=--
extra
-
port
=
$extra_port
;
let
$restart_noprint
=
1
;
source
include
/
restart_mysqld
.
inc
;
connect
(
con1
,
localhost
,
root
,,
test
);
connection
con1
;
let
$con1_id
=
`SELECT CONNECTION_ID()`
;
connect
(
con2
,
localhost
,
root
,,
test
);
connection
con2
;
let
$con2_id
=
`SELECT CONNECTION_ID()`
;
connect
(
extra_con
,
127.0
.
0.1
,
root
,,
test
,
$extra_port
,);
connection
con1
;
send
SELECT
SLEEP
(
1000
);
connection
extra_con
;
let
$wait_condition
=
SELECT
COUNT
(
*
)
>
0
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
STATE
=
'User sleep'
AND
ID
=
$con1_id
;
--
source
include
/
wait_condition
.
inc
connection
con2
;
send
DO
1
;
connection
extra_con
;
let
$wait_condition
=
SELECT
COUNT
(
*
)
>
0
FROM
INFORMATION_SCHEMA
.
THREAD_POOL_QUEUES
WHERE
CONNECTION_ID
IS
NOT
NULL
;
--
source
include
/
wait_condition
.
inc
--
replace_result
$con1_id
con1_id
eval
KILL
QUERY
$con1_id
;
disconnect
extra_con
;
connection
con1
;
error
0
,
ER_QUERY_INTERRUPTED
;
reap
;
disconnect
con1
;
connection
con2
;
reap
;
disconnect
con2
;
connection
default
;
mysql-test/suite/innodb/r/innodb-alter-timestamp.result
View file @
49f95c40
...
@@ -139,3 +139,13 @@ ALTER TABLE t1 ADD f3 DATE NOT NULL, ALGORITHM=INPLACE;
...
@@ -139,3 +139,13 @@ ALTER TABLE t1 ADD f3 DATE NOT NULL, ALGORITHM=INPLACE;
ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
DROP TABLE t1;
DROP TABLE t1;
disconnect purge_control;
disconnect purge_control;
#
# MDEV-26458 SIGSEGV in innobase_table_is_empty() on ALTER TABLE
#
CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
ALTER TABLE t DISCARD TABLESPACE;
SET sql_mode='NO_ZERO_DATE';
ALTER TABLE t ADD c DATE NOT NULL;
SET sql_mode=DEFAULT;
DROP TABLE t;
# End of 10.3 tests
mysql-test/suite/innodb/t/innodb-alter-timestamp.test
View file @
49f95c40
...
@@ -103,3 +103,15 @@ INSERT INTO t1 VALUES (1, now());
...
@@ -103,3 +103,15 @@ INSERT INTO t1 VALUES (1, now());
ALTER
TABLE
t1
ADD
f3
DATE
NOT
NULL
,
ALGORITHM
=
INPLACE
;
ALTER
TABLE
t1
ADD
f3
DATE
NOT
NULL
,
ALGORITHM
=
INPLACE
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
disconnect
purge_control
;
disconnect
purge_control
;
--
echo
#
--
echo
# MDEV-26458 SIGSEGV in innobase_table_is_empty() on ALTER TABLE
--
echo
#
CREATE
TABLE
t
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
ALTER
TABLE
t
DISCARD
TABLESPACE
;
SET
sql_mode
=
'NO_ZERO_DATE'
;
ALTER
TABLE
t
ADD
c
DATE
NOT
NULL
;
SET
sql_mode
=
DEFAULT
;
DROP
TABLE
t
;
--
echo
# End of 10.3 tests
plugin/auth_pam/CMakeLists.txt
View file @
49f95c40
...
@@ -44,6 +44,9 @@ IF(HAVE_PAM_APPL_H AND HAVE_GETGROUPLIST)
...
@@ -44,6 +44,9 @@ IF(HAVE_PAM_APPL_H AND HAVE_GETGROUPLIST)
TARGET_LINK_LIBRARIES
(
auth_pam_tool pam
)
TARGET_LINK_LIBRARIES
(
auth_pam_tool pam
)
INSTALL
(
CODE
"EXECUTE_PROCESS(
INSTALL
(
CODE
"EXECUTE_PROCESS(
COMMAND chmod u=rwx,g=,o= auth_pam_tool_dir
COMMAND chmod u=rwx,g=,o= auth_pam_tool_dir
WORKING_DIRECTORY
\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
INSTALL_PLUGINDIR
}
/)"
COMPONENT Server
)
INSTALL
(
CODE
"EXECUTE_PROCESS(
COMMAND chmod u=rwxs,g=rx,o=rx auth_pam_tool_dir/auth_pam_tool
COMMAND chmod u=rwxs,g=rx,o=rx auth_pam_tool_dir/auth_pam_tool
WORKING_DIRECTORY
\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
INSTALL_PLUGINDIR
}
/)"
WORKING_DIRECTORY
\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
INSTALL_PLUGINDIR
}
/)"
COMPONENT Server
)
COMPONENT Server
)
...
...
sql/table.h
View file @
49f95c40
#ifndef TABLE_INCLUDED
#ifndef TABLE_INCLUDED
#define TABLE_INCLUDED
#define TABLE_INCLUDED
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2009, 202
0
, MariaDB
Copyright (c) 2009, 202
1
, MariaDB
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
...
sql/thread_pool_info.cc
View file @
49f95c40
...
@@ -131,7 +131,10 @@ static int queues_fill_table(THD* thd, TABLE_LIST* tables, COND*)
...
@@ -131,7 +131,10 @@ static int queues_fill_table(THD* thd, TABLE_LIST* tables, COND*)
table
->
field
[
2
]
->
store
(
prio
,
true
);
table
->
field
[
2
]
->
store
(
prio
,
true
);
/* CONNECTION_ID */
/* CONNECTION_ID */
if
(
c
->
thd
)
if
(
c
->
thd
)
{
table
->
field
[
3
]
->
set_notnull
();
table
->
field
[
3
]
->
store
(
c
->
thd
->
thread_id
,
true
);
table
->
field
[
3
]
->
store
(
c
->
thd
->
thread_id
,
true
);
}
/* QUEUEING_TIME */
/* QUEUEING_TIME */
table
->
field
[
4
]
->
store
(
now
-
c
->
enqueue_time
,
true
);
table
->
field
[
4
]
->
store
(
now
-
c
->
enqueue_time
,
true
);
...
...
sql/threadpool_generic.cc
View file @
49f95c40
...
@@ -1206,7 +1206,7 @@ TP_connection_generic *get_event(worker_thread_t *current_thread,
...
@@ -1206,7 +1206,7 @@ TP_connection_generic *get_event(worker_thread_t *current_thread,
non-blocking event poll, i.e with timeout = 0.
non-blocking event poll, i.e with timeout = 0.
If this returns events, pick one
If this returns events, pick one
*/
*/
if
(
!
oversubscribed
)
if
(
!
oversubscribed
&&
!
threadpool_dedicated_listener
)
{
{
native_event
ev
[
MAX_EVENTS
];
native_event
ev
[
MAX_EVENTS
];
int
cnt
=
io_poll_wait
(
thread_group
->
pollfd
,
ev
,
MAX_EVENTS
,
0
);
int
cnt
=
io_poll_wait
(
thread_group
->
pollfd
,
ev
,
MAX_EVENTS
,
0
);
...
...
storage/innobase/btr/btr0sea.cc
View file @
49f95c40
...
@@ -205,6 +205,8 @@ ATTRIBUTE_COLD static void btr_search_lazy_free(dict_index_t *index)
...
@@ -205,6 +205,8 @@ ATTRIBUTE_COLD static void btr_search_lazy_free(dict_index_t *index)
{
{
ut_ad
(
index
->
freed
());
ut_ad
(
index
->
freed
());
dict_table_t
*
table
=
index
->
table
;
dict_table_t
*
table
=
index
->
table
;
table
->
autoinc_mutex
.
wr_lock
();
/* Perform the skipped steps of dict_index_remove_from_cache_low(). */
/* Perform the skipped steps of dict_index_remove_from_cache_low(). */
UT_LIST_REMOVE
(
table
->
freed_indexes
,
index
);
UT_LIST_REMOVE
(
table
->
freed_indexes
,
index
);
index
->
lock
.
free
();
index
->
lock
.
free
();
...
@@ -213,9 +215,14 @@ ATTRIBUTE_COLD static void btr_search_lazy_free(dict_index_t *index)
...
@@ -213,9 +215,14 @@ ATTRIBUTE_COLD static void btr_search_lazy_free(dict_index_t *index)
if
(
!
UT_LIST_GET_LEN
(
table
->
freed_indexes
)
&&
if
(
!
UT_LIST_GET_LEN
(
table
->
freed_indexes
)
&&
!
UT_LIST_GET_LEN
(
table
->
indexes
))
!
UT_LIST_GET_LEN
(
table
->
indexes
))
{
{
ut_ad
(
table
->
id
==
0
);
ut_ad
(
!
table
->
id
);
table
->
autoinc_mutex
.
wr_unlock
();
table
->
autoinc_mutex
.
destroy
();
dict_mem_table_free
(
table
);
dict_mem_table_free
(
table
);
return
;
}
}
table
->
autoinc_mutex
.
wr_unlock
();
}
}
/** Disable the adaptive hash search system and empty the index. */
/** Disable the adaptive hash search system and empty the index. */
...
...
storage/innobase/dict/dict0dict.cc
View file @
49f95c40
...
@@ -1338,6 +1338,7 @@ dict_index_t *dict_index_t::clone_if_needed()
...
@@ -1338,6 +1338,7 @@ dict_index_t *dict_index_t::clone_if_needed()
return
this
;
return
this
;
dict_index_t
*
prev
=
UT_LIST_GET_PREV
(
indexes
,
this
);
dict_index_t
*
prev
=
UT_LIST_GET_PREV
(
indexes
,
this
);
table
->
autoinc_mutex
.
wr_lock
();
UT_LIST_REMOVE
(
table
->
indexes
,
this
);
UT_LIST_REMOVE
(
table
->
indexes
,
this
);
UT_LIST_ADD_LAST
(
table
->
freed_indexes
,
this
);
UT_LIST_ADD_LAST
(
table
->
freed_indexes
,
this
);
dict_index_t
*
index
=
clone
();
dict_index_t
*
index
=
clone
();
...
@@ -1346,6 +1347,7 @@ dict_index_t *dict_index_t::clone_if_needed()
...
@@ -1346,6 +1347,7 @@ dict_index_t *dict_index_t::clone_if_needed()
UT_LIST_INSERT_AFTER
(
table
->
indexes
,
prev
,
index
);
UT_LIST_INSERT_AFTER
(
table
->
indexes
,
prev
,
index
);
else
else
UT_LIST_ADD_FIRST
(
table
->
indexes
,
index
);
UT_LIST_ADD_FIRST
(
table
->
indexes
,
index
);
table
->
autoinc_mutex
.
wr_unlock
();
return
index
;
return
index
;
}
}
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
...
@@ -1958,27 +1960,34 @@ void dict_sys_t::remove(dict_table_t* table, bool lru, bool keep)
...
@@ -1958,27 +1960,34 @@ void dict_sys_t::remove(dict_table_t* table, bool lru, bool keep)
UT_DELETE
(
table
->
vc_templ
);
UT_DELETE
(
table
->
vc_templ
);
}
}
table
->
autoinc_mutex
.
destroy
();
table
->
lock_mutex_destroy
();
table
->
lock_mutex_destroy
();
if
(
keep
)
{
if
(
keep
)
{
table
->
autoinc_mutex
.
destroy
();
return
;
return
;
}
}
#ifdef BTR_CUR_HASH_ADAPT
#ifdef BTR_CUR_HASH_ADAPT
if
(
UNIV_UNLIKELY
(
UT_LIST_GET_LEN
(
table
->
freed_indexes
)
!=
0
))
{
if
(
table
->
fts
)
{
if
(
table
->
fts
)
{
fts_optimize_remove_table
(
table
);
fts_optimize_remove_table
(
table
);
fts_free
(
table
);
fts_free
(
table
);
table
->
fts
=
NULL
;
table
->
fts
=
NULL
;
}
}
table
->
autoinc_mutex
.
wr_lock
();
table
->
vc_templ
=
NULL
;
ulint
freed
=
UT_LIST_GET_LEN
(
table
->
freed_indexes
);
table
->
id
=
0
;
table
->
vc_templ
=
NULL
;
table
->
id
=
0
;
table
->
autoinc_mutex
.
wr_unlock
();
if
(
UNIV_UNLIKELY
(
freed
!=
0
))
{
return
;
return
;
}
}
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
table
->
autoinc_mutex
.
destroy
();
dict_mem_table_free
(
table
);
dict_mem_table_free
(
table
);
}
}
...
@@ -2193,8 +2202,10 @@ dict_index_remove_from_cache_low(
...
@@ -2193,8 +2202,10 @@ dict_index_remove_from_cache_low(
zero. See also: dict_table_can_be_evicted() */
zero. See also: dict_table_can_be_evicted() */
if
(
index
->
n_ahi_pages
())
{
if
(
index
->
n_ahi_pages
())
{
table
->
autoinc_mutex
.
wr_lock
();
index
->
set_freed
();
index
->
set_freed
();
UT_LIST_ADD_LAST
(
table
->
freed_indexes
,
index
);
UT_LIST_ADD_LAST
(
table
->
freed_indexes
,
index
);
table
->
autoinc_mutex
.
wr_unlock
();
return
;
return
;
}
}
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
...
...
storage/innobase/handler/handler0alter.cc
View file @
49f95c40
...
@@ -2205,6 +2205,7 @@ ha_innobase::check_if_supported_inplace_alter(
...
@@ -2205,6 +2205,7 @@ ha_innobase::check_if_supported_inplace_alter(
/* '0000-00-00' value isn't allowed for datetime datatype
/* '0000-00-00' value isn't allowed for datetime datatype
for newly added column when table is not empty */
for newly added column when table is not empty */
if
(
ha_alter_info
->
error_if_not_empty
if
(
ha_alter_info
->
error_if_not_empty
&&
m_prebuilt
->
table
->
space
&&
!
innobase_table_is_empty
(
m_prebuilt
->
table
))
{
&&
!
innobase_table_is_empty
(
m_prebuilt
->
table
))
{
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
DBUG_RETURN
(
HA_ALTER_INPLACE_NOT_SUPPORTED
);
}
}
...
...
storage/innobase/handler/i_s.cc
View file @
49f95c40
...
@@ -266,7 +266,7 @@ static TypelibBuffer<4> isolation_level_values_typelib(isolation_level_values);
...
@@ -266,7 +266,7 @@ static TypelibBuffer<4> isolation_level_values_typelib(isolation_level_values);
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_trx */
static
ST_FIELD_INFO
innodb_trx_fields_info
[]
=
static
ST_FIELD_INFO
innodb_trx_fields_info
[]
=
{
{
#define IDX_TRX_ID 0
#define IDX_TRX_ID 0
Column
(
"trx_id"
,
ULonglong
(),
NOT_NULL
),
Column
(
"trx_id"
,
ULonglong
(),
NOT_NULL
),
...
@@ -518,49 +518,49 @@ struct st_maria_plugin i_s_innodb_trx =
...
@@ -518,49 +518,49 @@ struct st_maria_plugin i_s_innodb_trx =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_TRX"
)
,
"INNODB_TRX"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB transactions"
)
,
"InnoDB transactions"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_trx_init
)
,
innodb_trx_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
static
const
LEX_CSTRING
lock_mode_values
[]
=
static
const
LEX_CSTRING
lock_mode_values
[]
=
...
@@ -588,7 +588,7 @@ static TypelibBuffer<2> lock_type_values_typelib(lock_type_values);
...
@@ -588,7 +588,7 @@ static TypelibBuffer<2> lock_type_values_typelib(lock_type_values);
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_locks */
static
ST_FIELD_INFO
innodb_locks_fields_info
[]
=
static
ST_FIELD_INFO
innodb_locks_fields_info
[]
=
{
{
#define IDX_LOCK_ID 0
#define IDX_LOCK_ID 0
Column
(
"lock_id"
,
Varchar
(
TRX_I_S_LOCK_ID_MAX_LEN
+
1
),
NOT_NULL
),
Column
(
"lock_id"
,
Varchar
(
TRX_I_S_LOCK_ID_MAX_LEN
+
1
),
NOT_NULL
),
...
@@ -733,55 +733,55 @@ struct st_maria_plugin i_s_innodb_locks =
...
@@ -733,55 +733,55 @@ struct st_maria_plugin i_s_innodb_locks =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_LOCKS"
)
,
"INNODB_LOCKS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB conflicting locks"
)
,
"InnoDB conflicting locks"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_locks_init
)
,
innodb_locks_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_lock_waits */
static
ST_FIELD_INFO
innodb_lock_waits_fields_info
[]
=
static
ST_FIELD_INFO
innodb_lock_waits_fields_info
[]
=
{
{
#define IDX_REQUESTING_TRX_ID 0
#define IDX_REQUESTING_TRX_ID 0
Column
(
"requesting_trx_id"
,
ULonglong
(),
NOT_NULL
),
Column
(
"requesting_trx_id"
,
ULonglong
(),
NOT_NULL
),
...
@@ -887,49 +887,49 @@ struct st_maria_plugin i_s_innodb_lock_waits =
...
@@ -887,49 +887,49 @@ struct st_maria_plugin i_s_innodb_lock_waits =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_LOCK_WAITS"
)
,
"INNODB_LOCK_WAITS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB which lock is blocking which"
)
,
"InnoDB which lock is blocking which"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_lock_waits_init
)
,
innodb_lock_waits_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
/*******************************************************************//**
/*******************************************************************//**
...
@@ -1033,7 +1033,7 @@ trx_i_s_common_fill_table(
...
@@ -1033,7 +1033,7 @@ trx_i_s_common_fill_table(
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table information_schema.innodb_cmp. */
/* Fields of the dynamic table information_schema.innodb_cmp. */
static
ST_FIELD_INFO
i_s_cmp_fields_info
[]
=
static
ST_FIELD_INFO
i_s_cmp_fields_info
[]
=
{
{
Column
(
"page_size"
,
SLong
(
5
),
NOT_NULL
,
"Compressed Page Size"
),
Column
(
"page_size"
,
SLong
(
5
),
NOT_NULL
,
"Compressed Page Size"
),
Column
(
"compress_ops"
,
SLong
(),
NOT_NULL
,
"Total Number of Compressions"
),
Column
(
"compress_ops"
,
SLong
(),
NOT_NULL
,
"Total Number of Compressions"
),
...
@@ -1175,99 +1175,99 @@ struct st_maria_plugin i_s_innodb_cmp =
...
@@ -1175,99 +1175,99 @@ struct st_maria_plugin i_s_innodb_cmp =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMP"
)
,
"INNODB_CMP"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compression"
)
,
"Statistics for the InnoDB compression"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmp_init
)
,
i_s_cmp_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
struct
st_maria_plugin
i_s_innodb_cmp_reset
=
struct
st_maria_plugin
i_s_innodb_cmp_reset
=
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMP_RESET"
)
,
"INNODB_CMP_RESET"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compression;"
"Statistics for the InnoDB compression;"
" reset cumulated counts"
)
,
" reset cumulated counts"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmp_reset_init
)
,
i_s_cmp_reset_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
...
@@ -1275,7 +1275,7 @@ namespace Show {
...
@@ -1275,7 +1275,7 @@ namespace Show {
/* Fields of the dynamic tables
/* Fields of the dynamic tables
information_schema.innodb_cmp_per_index and
information_schema.innodb_cmp_per_index and
information_schema.innodb_cmp_per_index_reset. */
information_schema.innodb_cmp_per_index_reset. */
static
ST_FIELD_INFO
i_s_cmp_per_index_fields_info
[]
=
static
ST_FIELD_INFO
i_s_cmp_per_index_fields_info
[]
=
{
{
#define IDX_DATABASE_NAME 0
#define IDX_DATABASE_NAME 0
Column
(
"database_name"
,
Varchar
(
NAME_CHAR_LEN
),
NOT_NULL
),
Column
(
"database_name"
,
Varchar
(
NAME_CHAR_LEN
),
NOT_NULL
),
...
@@ -1481,105 +1481,105 @@ struct st_maria_plugin i_s_innodb_cmp_per_index =
...
@@ -1481,105 +1481,105 @@ struct st_maria_plugin i_s_innodb_cmp_per_index =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMP_PER_INDEX"
)
,
"INNODB_CMP_PER_INDEX"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compression (per index)"
)
,
"Statistics for the InnoDB compression (per index)"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmp_per_index_init
)
,
i_s_cmp_per_index_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
struct
st_maria_plugin
i_s_innodb_cmp_per_index_reset
=
struct
st_maria_plugin
i_s_innodb_cmp_per_index_reset
=
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMP_PER_INDEX_RESET"
)
,
"INNODB_CMP_PER_INDEX_RESET"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compression (per index);"
"Statistics for the InnoDB compression (per index);"
" reset cumulated counts"
)
,
" reset cumulated counts"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmp_per_index_reset_init
)
,
i_s_cmp_per_index_reset_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table information_schema.innodb_cmpmem. */
/* Fields of the dynamic table information_schema.innodb_cmpmem. */
static
ST_FIELD_INFO
i_s_cmpmem_fields_info
[]
=
static
ST_FIELD_INFO
i_s_cmpmem_fields_info
[]
=
{
{
Column
(
"page_size"
,
SLong
(
5
),
NOT_NULL
,
"Buddy Block Size"
),
Column
(
"page_size"
,
SLong
(
5
),
NOT_NULL
,
"Buddy Block Size"
),
Column
(
"buffer_pool_instance"
,
SLong
(),
NOT_NULL
,
"Buffer Pool Id"
),
Column
(
"buffer_pool_instance"
,
SLong
(),
NOT_NULL
,
"Buffer Pool Id"
),
...
@@ -1726,99 +1726,99 @@ struct st_maria_plugin i_s_innodb_cmpmem =
...
@@ -1726,99 +1726,99 @@ struct st_maria_plugin i_s_innodb_cmpmem =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMPMEM"
)
,
"INNODB_CMPMEM"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compressed buffer pool"
)
,
"Statistics for the InnoDB compressed buffer pool"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmpmem_init
)
,
i_s_cmpmem_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
struct
st_maria_plugin
i_s_innodb_cmpmem_reset
=
struct
st_maria_plugin
i_s_innodb_cmpmem_reset
=
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_CMPMEM_RESET"
)
,
"INNODB_CMPMEM_RESET"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Statistics for the InnoDB compressed buffer pool;"
"Statistics for the InnoDB compressed buffer pool;"
" reset cumulated counts"
)
,
" reset cumulated counts"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_cmpmem_reset_init
)
,
i_s_cmpmem_reset_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
...
@@ -1835,7 +1835,7 @@ static TypelibBuffer<5> metric_type_values_typelib(metric_type_values);
...
@@ -1835,7 +1835,7 @@ static TypelibBuffer<5> metric_type_values_typelib(metric_type_values);
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_metrics */
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_metrics */
static
ST_FIELD_INFO
innodb_metrics_fields_info
[]
=
static
ST_FIELD_INFO
innodb_metrics_fields_info
[]
=
{
{
#define METRIC_NAME 0
#define METRIC_NAME 0
Column
(
"NAME"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
Column
(
"NAME"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
...
@@ -2208,54 +2208,54 @@ struct st_maria_plugin i_s_innodb_metrics =
...
@@ -2208,54 +2208,54 @@ struct st_maria_plugin i_s_innodb_metrics =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_METRICS"
)
,
"INNODB_METRICS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB Metrics Info"
)
,
"InnoDB Metrics Info"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_metrics_init
)
,
innodb_metrics_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_ft_default_stopword */
/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_ft_default_stopword */
static
ST_FIELD_INFO
i_s_stopword_fields_info
[]
=
static
ST_FIELD_INFO
i_s_stopword_fields_info
[]
=
{
{
#define STOPWORD_VALUE 0
#define STOPWORD_VALUE 0
Column
(
"value"
,
Varchar
(
TRX_ID_MAX_LEN
+
1
),
NOT_NULL
),
Column
(
"value"
,
Varchar
(
TRX_ID_MAX_LEN
+
1
),
NOT_NULL
),
...
@@ -2317,55 +2317,55 @@ struct st_maria_plugin i_s_innodb_ft_default_stopword =
...
@@ -2317,55 +2317,55 @@ struct st_maria_plugin i_s_innodb_ft_default_stopword =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_DEFAULT_STOPWORD"
)
,
"INNODB_FT_DEFAULT_STOPWORD"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"Default stopword list for InnoDB Full Text Search"
)
,
"Default stopword list for InnoDB Full Text Search"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_stopword_init
)
,
i_s_stopword_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_DELETED
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_DELETED
INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED */
INFORMATION_SCHEMA.INNODB_FT_BEING_DELETED */
static
ST_FIELD_INFO
i_s_fts_doc_fields_info
[]
=
static
ST_FIELD_INFO
i_s_fts_doc_fields_info
[]
=
{
{
#define I_S_FTS_DOC_ID 0
#define I_S_FTS_DOC_ID 0
Column
(
"DOC_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"DOC_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -2486,49 +2486,49 @@ struct st_maria_plugin i_s_innodb_ft_deleted =
...
@@ -2486,49 +2486,49 @@ struct st_maria_plugin i_s_innodb_ft_deleted =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_DELETED"
)
,
"INNODB_FT_DELETED"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"INNODB AUXILIARY FTS DELETED TABLE"
)
,
"INNODB AUXILIARY FTS DELETED TABLE"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_fts_deleted_init
)
,
i_s_fts_deleted_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
/*******************************************************************//**
/*******************************************************************//**
...
@@ -2569,56 +2569,56 @@ struct st_maria_plugin i_s_innodb_ft_being_deleted =
...
@@ -2569,56 +2569,56 @@ struct st_maria_plugin i_s_innodb_ft_being_deleted =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_BEING_DELETED"
)
,
"INNODB_FT_BEING_DELETED"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"INNODB AUXILIARY FTS BEING DELETED TABLE"
)
,
"INNODB AUXILIARY FTS BEING DELETED TABLE"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_fts_being_deleted_init
)
,
i_s_fts_being_deleted_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHED and
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_INDEX_CACHED and
INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE */
INFORMATION_SCHEMA.INNODB_FT_INDEX_TABLE */
static
ST_FIELD_INFO
i_s_fts_index_fields_info
[]
=
static
ST_FIELD_INFO
i_s_fts_index_fields_info
[]
=
{
{
#define I_S_FTS_WORD 0
#define I_S_FTS_WORD 0
Column
(
"WORD"
,
Varchar
(
FTS_MAX_WORD_LEN
+
1
),
NOT_NULL
),
Column
(
"WORD"
,
Varchar
(
FTS_MAX_WORD_LEN
+
1
),
NOT_NULL
),
...
@@ -2834,49 +2834,49 @@ struct st_maria_plugin i_s_innodb_ft_index_cache =
...
@@ -2834,49 +2834,49 @@ struct st_maria_plugin i_s_innodb_ft_index_cache =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_INDEX_CACHE"
)
,
"INNODB_FT_INDEX_CACHE"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"INNODB AUXILIARY FTS INDEX CACHED"
)
,
"INNODB AUXILIARY FTS INDEX CACHED"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_fts_index_cache_init
)
,
i_s_fts_index_cache_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
/*******************************************************************//**
/*******************************************************************//**
...
@@ -3267,55 +3267,55 @@ struct st_maria_plugin i_s_innodb_ft_index_table =
...
@@ -3267,55 +3267,55 @@ struct st_maria_plugin i_s_innodb_ft_index_table =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_INDEX_TABLE"
)
,
"INNODB_FT_INDEX_TABLE"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"INNODB AUXILIARY FTS INDEX TABLE"
)
,
"INNODB AUXILIARY FTS INDEX TABLE"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_fts_index_table_init
)
,
i_s_fts_index_table_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_CONFIG */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_FT_CONFIG */
static
ST_FIELD_INFO
i_s_fts_config_fields_info
[]
=
static
ST_FIELD_INFO
i_s_fts_config_fields_info
[]
=
{
{
#define FTS_CONFIG_KEY 0
#define FTS_CONFIG_KEY 0
Column
(
"KEY"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
Column
(
"KEY"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
...
@@ -3460,54 +3460,54 @@ struct st_maria_plugin i_s_innodb_ft_config =
...
@@ -3460,54 +3460,54 @@ struct st_maria_plugin i_s_innodb_ft_config =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_FT_CONFIG"
)
,
"INNODB_FT_CONFIG"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"INNODB AUXILIARY FTS CONFIG TABLE"
)
,
"INNODB AUXILIARY FTS CONFIG TABLE"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_fts_config_init
)
,
i_s_fts_config_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INNODB_BUFFER_POOL_STATS. */
/* Fields of the dynamic table INNODB_BUFFER_POOL_STATS. */
static
ST_FIELD_INFO
i_s_innodb_buffer_stats_fields_info
[]
=
static
ST_FIELD_INFO
i_s_innodb_buffer_stats_fields_info
[]
=
{
{
#define IDX_BUF_STATS_POOL_ID 0
#define IDX_BUF_STATS_POOL_ID 0
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
...
@@ -3760,49 +3760,49 @@ struct st_maria_plugin i_s_innodb_buffer_stats =
...
@@ -3760,49 +3760,49 @@ struct st_maria_plugin i_s_innodb_buffer_stats =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_BUFFER_POOL_STATS"
)
,
"INNODB_BUFFER_POOL_STATS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB Buffer Pool Statistics Information "
)
,
"InnoDB Buffer Pool Statistics Information "
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_innodb_buffer_pool_stats_init
)
,
i_s_innodb_buffer_pool_stats_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
/** These must correspond to the first values of buf_page_state */
/** These must correspond to the first values of buf_page_state */
...
@@ -3829,7 +3829,7 @@ static TypelibBuffer<4> io_values_typelib(io_values);
...
@@ -3829,7 +3829,7 @@ static TypelibBuffer<4> io_values_typelib(io_values);
namespace
Show
{
namespace
Show
{
/* Fields of the dynamic table INNODB_BUFFER_POOL_PAGE. */
/* Fields of the dynamic table INNODB_BUFFER_POOL_PAGE. */
static
ST_FIELD_INFO
i_s_innodb_buffer_page_fields_info
[]
=
static
ST_FIELD_INFO
i_s_innodb_buffer_page_fields_info
[]
=
{
{
#define IDX_BUFFER_POOL_ID 0
#define IDX_BUFFER_POOL_ID 0
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
...
@@ -3856,7 +3856,6 @@ static ST_FIELD_INFO i_s_innodb_buffer_page_fields_info[] =
...
@@ -3856,7 +3856,6 @@ static ST_FIELD_INFO i_s_innodb_buffer_page_fields_info[] =
#define IDX_BUFFER_PAGE_HASHED 7
#define IDX_BUFFER_PAGE_HASHED 7
Column
(
"IS_HASHED"
,
SLong
(
1
),
NOT_NULL
),
Column
(
"IS_HASHED"
,
SLong
(
1
),
NOT_NULL
),
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
#define IDX_BUFFER_PAGE_NEWEST_MOD 7 + I_S_AHI
#define IDX_BUFFER_PAGE_NEWEST_MOD 7 + I_S_AHI
Column
(
"NEWEST_MODIFICATION"
,
ULonglong
(),
NOT_NULL
),
Column
(
"NEWEST_MODIFICATION"
,
ULonglong
(),
NOT_NULL
),
...
@@ -4293,53 +4292,53 @@ struct st_maria_plugin i_s_innodb_buffer_page =
...
@@ -4293,53 +4292,53 @@ struct st_maria_plugin i_s_innodb_buffer_page =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_BUFFER_PAGE"
)
,
"INNODB_BUFFER_PAGE"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB Buffer Page Information"
)
,
"InnoDB Buffer Page Information"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_innodb_buffer_page_init
)
,
i_s_innodb_buffer_page_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
static
ST_FIELD_INFO
i_s_innodb_buf_page_lru_fields_info
[]
=
static
ST_FIELD_INFO
i_s_innodb_buf_page_lru_fields_info
[]
=
{
{
#define IDX_BUF_LRU_POOL_ID 0
#define IDX_BUF_LRU_POOL_ID 0
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
Column
(
"POOL_ID"
,
ULong
(),
NOT_NULL
),
...
@@ -4366,7 +4365,6 @@ static ST_FIELD_INFO i_s_innodb_buf_page_lru_fields_info[] =
...
@@ -4366,7 +4365,6 @@ static ST_FIELD_INFO i_s_innodb_buf_page_lru_fields_info[] =
#define IDX_BUF_LRU_PAGE_HASHED 7
#define IDX_BUF_LRU_PAGE_HASHED 7
Column
(
"IS_HASHED"
,
SLong
(
1
),
NOT_NULL
),
Column
(
"IS_HASHED"
,
SLong
(
1
),
NOT_NULL
),
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
#define IDX_BUF_LRU_PAGE_NEWEST_MOD 7 + I_S_AHI
#define IDX_BUF_LRU_PAGE_NEWEST_MOD 7 + I_S_AHI
Column
(
"NEWEST_MODIFICATION"
,
ULonglong
(),
NOT_NULL
),
Column
(
"NEWEST_MODIFICATION"
,
ULonglong
(),
NOT_NULL
),
...
@@ -4636,49 +4634,49 @@ struct st_maria_plugin i_s_innodb_buffer_page_lru =
...
@@ -4636,49 +4634,49 @@ struct st_maria_plugin i_s_innodb_buffer_page_lru =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_BUFFER_PAGE_LRU"
)
,
"INNODB_BUFFER_PAGE_LRU"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB Buffer Page in LRU"
)
,
"InnoDB Buffer Page in LRU"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
i_s_innodb_buffer_page_lru_init
)
,
i_s_innodb_buffer_page_lru_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
/*******************************************************************//**
/*******************************************************************//**
...
@@ -4714,7 +4712,7 @@ static TypelibBuffer<2> space_type_values_typelib(space_type_values);
...
@@ -4714,7 +4712,7 @@ static TypelibBuffer<2> space_type_values_typelib(space_type_values);
namespace
Show
{
namespace
Show
{
/** SYS_TABLES ***************************************************/
/** SYS_TABLES ***************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLES */
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLES */
static
ST_FIELD_INFO
innodb_sys_tables_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_tables_fields_info
[]
=
{
{
#define SYS_TABLES_ID 0
#define SYS_TABLES_ID 0
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -4924,55 +4922,55 @@ struct st_maria_plugin i_s_innodb_sys_tables =
...
@@ -4924,55 +4922,55 @@ struct st_maria_plugin i_s_innodb_sys_tables =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_TABLES"
)
,
"INNODB_SYS_TABLES"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_TABLES"
)
,
"InnoDB SYS_TABLES"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_tables_init
)
,
innodb_sys_tables_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_TABLESTATS ***********************************************/
/** SYS_TABLESTATS ***********************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */
static
ST_FIELD_INFO
innodb_sys_tablestats_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_tablestats_fields_info
[]
=
{
{
#define SYS_TABLESTATS_ID 0
#define SYS_TABLESTATS_ID 0
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -5168,55 +5166,55 @@ struct st_maria_plugin i_s_innodb_sys_tablestats =
...
@@ -5168,55 +5166,55 @@ struct st_maria_plugin i_s_innodb_sys_tablestats =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_TABLESTATS"
)
,
"INNODB_SYS_TABLESTATS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_TABLESTATS"
)
,
"InnoDB SYS_TABLESTATS"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_tablestats_init
)
,
innodb_sys_tablestats_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_INDEXES **************************************************/
/** SYS_INDEXES **************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */
static
ST_FIELD_INFO
innodb_sysindex_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sysindex_fields_info
[]
=
{
{
#define SYS_INDEX_ID 0
#define SYS_INDEX_ID 0
Column
(
"INDEX_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"INDEX_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -5407,55 +5405,55 @@ struct st_maria_plugin i_s_innodb_sys_indexes =
...
@@ -5407,55 +5405,55 @@ struct st_maria_plugin i_s_innodb_sys_indexes =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_INDEXES"
)
,
"INNODB_SYS_INDEXES"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_INDEXES"
)
,
"InnoDB SYS_INDEXES"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_indexes_init
)
,
innodb_sys_indexes_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_COLUMNS **************************************************/
/** SYS_COLUMNS **************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_COLUMNS */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_COLUMNS */
static
ST_FIELD_INFO
innodb_sys_columns_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_columns_fields_info
[]
=
{
{
#define SYS_COLUMN_TABLE_ID 0
#define SYS_COLUMN_TABLE_ID 0
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -5619,55 +5617,55 @@ struct st_maria_plugin i_s_innodb_sys_columns =
...
@@ -5619,55 +5617,55 @@ struct st_maria_plugin i_s_innodb_sys_columns =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_COLUMNS"
)
,
"INNODB_SYS_COLUMNS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_COLUMNS"
)
,
"InnoDB SYS_COLUMNS"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_columns_init
)
,
innodb_sys_columns_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_VIRTUAL **************************************************/
/** SYS_VIRTUAL **************************************************/
/** Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL */
/** Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_VIRTUAL */
static
ST_FIELD_INFO
innodb_sys_virtual_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_virtual_fields_info
[]
=
{
{
#define SYS_VIRTUAL_TABLE_ID 0
#define SYS_VIRTUAL_TABLE_ID 0
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"TABLE_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -5806,56 +5804,56 @@ struct st_maria_plugin i_s_innodb_sys_virtual =
...
@@ -5806,56 +5804,56 @@ struct st_maria_plugin i_s_innodb_sys_virtual =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_VIRTUAL"
)
,
"INNODB_SYS_VIRTUAL"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_VIRTUAL"
)
,
"InnoDB SYS_VIRTUAL"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_virtual_init
)
,
innodb_sys_virtual_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_FIELDS ***************************************************/
/** SYS_FIELDS ***************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FIELDS */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FIELDS */
static
ST_FIELD_INFO
innodb_sys_fields_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_fields_fields_info
[]
=
{
{
#define SYS_FIELD_INDEX_ID 0
#define SYS_FIELD_INDEX_ID 0
Column
(
"INDEX_ID"
,
ULonglong
(),
NOT_NULL
),
Column
(
"INDEX_ID"
,
ULonglong
(),
NOT_NULL
),
...
@@ -6001,55 +5999,55 @@ struct st_maria_plugin i_s_innodb_sys_fields =
...
@@ -6001,55 +5999,55 @@ struct st_maria_plugin i_s_innodb_sys_fields =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_FIELDS"
)
,
"INNODB_SYS_FIELDS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_FIELDS"
)
,
"InnoDB SYS_FIELDS"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_fields_init
)
,
innodb_sys_fields_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_FOREIGN ********************************************/
/** SYS_FOREIGN ********************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN */
static
ST_FIELD_INFO
innodb_sys_foreign_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_foreign_fields_info
[]
=
{
{
#define SYS_FOREIGN_ID 0
#define SYS_FOREIGN_ID 0
Column
(
"ID"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
Column
(
"ID"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
...
@@ -6197,55 +6195,55 @@ struct st_maria_plugin i_s_innodb_sys_foreign =
...
@@ -6197,55 +6195,55 @@ struct st_maria_plugin i_s_innodb_sys_foreign =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_FOREIGN"
)
,
"INNODB_SYS_FOREIGN"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_FOREIGN"
)
,
"InnoDB SYS_FOREIGN"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_foreign_init
)
,
innodb_sys_foreign_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_FOREIGN_COLS ********************************************/
/** SYS_FOREIGN_COLS ********************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS */
static
ST_FIELD_INFO
innodb_sys_foreign_cols_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_foreign_cols_fields_info
[]
=
{
{
#define SYS_FOREIGN_COL_ID 0
#define SYS_FOREIGN_COL_ID 0
Column
(
"ID"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
Column
(
"ID"
,
Varchar
(
NAME_LEN
+
1
),
NOT_NULL
),
...
@@ -6393,55 +6391,55 @@ struct st_maria_plugin i_s_innodb_sys_foreign_cols =
...
@@ -6393,55 +6391,55 @@ struct st_maria_plugin i_s_innodb_sys_foreign_cols =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_FOREIGN_COLS"
)
,
"INNODB_SYS_FOREIGN_COLS"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB SYS_FOREIGN_COLS"
)
,
"InnoDB SYS_FOREIGN_COLS"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_foreign_cols_init
)
,
innodb_sys_foreign_cols_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** SYS_TABLESPACES ********************************************/
/** SYS_TABLESPACES ********************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES */
/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES */
static
ST_FIELD_INFO
innodb_sys_tablespaces_fields_info
[]
=
static
ST_FIELD_INFO
innodb_sys_tablespaces_fields_info
[]
=
{
{
#define SYS_TABLESPACES_SPACE 0
#define SYS_TABLESPACES_SPACE 0
Column
(
"SPACE"
,
ULong
(),
NOT_NULL
),
Column
(
"SPACE"
,
ULong
(),
NOT_NULL
),
...
@@ -6610,55 +6608,55 @@ struct st_maria_plugin i_s_innodb_sys_tablespaces =
...
@@ -6610,55 +6608,55 @@ struct st_maria_plugin i_s_innodb_sys_tablespaces =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_SYS_TABLESPACES"
)
,
"INNODB_SYS_TABLESPACES"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
plugin_author
)
,
plugin_author
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB tablespaces"
)
,
"InnoDB tablespaces"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_GPL
)
,
PLUGIN_LICENSE_GPL
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_sys_tablespaces_init
)
,
innodb_sys_tablespaces_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
,
MariaDB_PLUGIN_MATURITY_STABLE
,
};
};
namespace
Show
{
namespace
Show
{
/** TABLESPACES_ENCRYPTION ********************************************/
/** TABLESPACES_ENCRYPTION ********************************************/
/* Fields of the table INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION */
/* Fields of the table INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION */
static
ST_FIELD_INFO
innodb_tablespaces_encryption_fields_info
[]
=
static
ST_FIELD_INFO
innodb_tablespaces_encryption_fields_info
[]
=
{
{
#define TABLESPACES_ENCRYPTION_SPACE 0
#define TABLESPACES_ENCRYPTION_SPACE 0
Column
(
"SPACE"
,
ULong
(),
NOT_NULL
),
Column
(
"SPACE"
,
ULong
(),
NOT_NULL
),
...
@@ -6837,47 +6835,47 @@ struct st_maria_plugin i_s_innodb_tablespaces_encryption =
...
@@ -6837,47 +6835,47 @@ struct st_maria_plugin i_s_innodb_tablespaces_encryption =
{
{
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* the plugin type (a MYSQL_XXX_PLUGIN value) */
/* int */
/* int */
STRUCT_FLD
(
type
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
)
,
MYSQL_INFORMATION_SCHEMA_PLUGIN
,
/* pointer to type-specific plugin descriptor */
/* pointer to type-specific plugin descriptor */
/* void* */
/* void* */
STRUCT_FLD
(
info
,
&
i_s_info
)
,
&
i_s_info
,
/* plugin name */
/* plugin name */
/* const char* */
/* const char* */
STRUCT_FLD
(
name
,
"INNODB_TABLESPACES_ENCRYPTION"
)
,
"INNODB_TABLESPACES_ENCRYPTION"
,
/* plugin author (for SHOW PLUGINS) */
/* plugin author (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
author
,
"Google Inc"
)
,
"Google Inc"
,
/* general descriptive text (for SHOW PLUGINS) */
/* general descriptive text (for SHOW PLUGINS) */
/* const char* */
/* const char* */
STRUCT_FLD
(
descr
,
"InnoDB TABLESPACES_ENCRYPTION"
)
,
"InnoDB TABLESPACES_ENCRYPTION"
,
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* the plugin license (PLUGIN_LICENSE_XXX) */
/* int */
/* int */
STRUCT_FLD
(
license
,
PLUGIN_LICENSE_BSD
)
,
PLUGIN_LICENSE_BSD
,
/* the function to invoke when plugin is loaded */
/* the function to invoke when plugin is loaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
init
,
innodb_tablespaces_encryption_init
)
,
innodb_tablespaces_encryption_init
,
/* the function to invoke when plugin is unloaded */
/* the function to invoke when plugin is unloaded */
/* int (*)(void*); */
/* int (*)(void*); */
STRUCT_FLD
(
deinit
,
i_s_common_deinit
)
,
i_s_common_deinit
,
/* plugin version (for SHOW PLUGINS) */
/* plugin version (for SHOW PLUGINS) */
/* unsigned int */
/* unsigned int */
STRUCT_FLD
(
version
,
INNODB_VERSION_SHORT
)
,
INNODB_VERSION_SHORT
,
/* struct st_mysql_show_var* */
/* struct st_mysql_show_var* */
STRUCT_FLD
(
status_vars
,
NULL
)
,
NULL
,
/* struct st_mysql_sys_var** */
/* struct st_mysql_sys_var** */
STRUCT_FLD
(
system_vars
,
NULL
)
,
NULL
,
/* Maria extension */
/* Maria extension */
STRUCT_FLD
(
version_info
,
INNODB_VERSION_STR
)
,
INNODB_VERSION_STR
,
STRUCT_FLD
(
maturity
,
MariaDB_PLUGIN_MATURITY_STABLE
)
MariaDB_PLUGIN_MATURITY_STABLE
};
};
storage/innobase/handler/i_s.h
View file @
49f95c40
/*****************************************************************************
/*****************************************************************************
Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2007, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2014, 202
0
, MariaDB Corporation.
Copyright (c) 2014, 202
1
, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
the terms of the GNU General Public License as published by the Free Software
...
@@ -88,14 +88,4 @@ do { \
...
@@ -88,14 +88,4 @@ do { \
} \
} \
} while (0)
} while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
#ifdef HAVE_C99_INITIALIZERS
#define STRUCT_FLD(name, value) .name = value
#else
#define STRUCT_FLD(name, value) name: value
#endif
/* HAVE_C99_INITIALIZERS */
#else
#define STRUCT_FLD(name, value) value
#endif
#endif
/* i_s_h */
#endif
/* i_s_h */
storage/innobase/include/dict0mem.h
View file @
49f95c40
...
@@ -2133,7 +2133,8 @@ struct dict_table_t {
...
@@ -2133,7 +2133,8 @@ struct dict_table_t {
UT_LIST_BASE_NODE_T
(
dict_index_t
)
indexes
;
UT_LIST_BASE_NODE_T
(
dict_index_t
)
indexes
;
#ifdef BTR_CUR_HASH_ADAPT
#ifdef BTR_CUR_HASH_ADAPT
/** List of detached indexes that are waiting to be freed along with
/** List of detached indexes that are waiting to be freed along with
the last adaptive hash index entry */
the last adaptive hash index entry.
Protected by autoinc_mutex (sic!) */
UT_LIST_BASE_NODE_T
(
dict_index_t
)
freed_indexes
;
UT_LIST_BASE_NODE_T
(
dict_index_t
)
freed_indexes
;
#endif
/* BTR_CUR_HASH_ADAPT */
#endif
/* BTR_CUR_HASH_ADAPT */
...
@@ -2285,7 +2286,7 @@ struct dict_table_t {
...
@@ -2285,7 +2286,7 @@ struct dict_table_t {
from a select. */
from a select. */
lock_t
*
autoinc_lock
;
lock_t
*
autoinc_lock
;
/** Mutex protecting autoinc. */
/** Mutex protecting autoinc
and freed_indexes
. */
srw_mutex
autoinc_mutex
;
srw_mutex
autoinc_mutex
;
private:
private:
/** Mutex protecting locks on this table. */
/** Mutex protecting locks on this table. */
...
@@ -2334,7 +2335,6 @@ struct dict_table_t {
...
@@ -2334,7 +2335,6 @@ struct dict_table_t {
lock_sys.assert_locked(page_id) and trx->mutex_is_owner() hold.
lock_sys.assert_locked(page_id) and trx->mutex_is_owner() hold.
@see trx_lock_t::trx_locks */
@see trx_lock_t::trx_locks */
Atomic_counter
<
uint32_t
>
n_rec_locks
;
Atomic_counter
<
uint32_t
>
n_rec_locks
;
private:
private:
/** Count of how many handles are opened to this table. Dropping of the
/** Count of how many handles are opened to this table. Dropping of the
table is NOT allowed until this count gets to zero. MySQL does NOT
table is NOT allowed until this count gets to zero. MySQL does NOT
...
...
storage/innobase/innodb.cmake
View file @
49f95c40
...
@@ -125,11 +125,6 @@ ENDIF()
...
@@ -125,11 +125,6 @@ ENDIF()
CHECK_FUNCTION_EXISTS
(
vasprintf HAVE_VASPRINTF
)
CHECK_FUNCTION_EXISTS
(
vasprintf HAVE_VASPRINTF
)
CHECK_CXX_SOURCE_COMPILES
(
"struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }"
HAVE_C99_INITIALIZERS
)
IF
(
HAVE_C99_INITIALIZERS
)
ADD_DEFINITIONS
(
-DHAVE_C99_INITIALIZERS
)
ENDIF
()
OPTION
(
WITH_INNODB_DISALLOW_WRITES
"InnoDB freeze writes patch from Google"
${
WITH_WSREP
}
)
OPTION
(
WITH_INNODB_DISALLOW_WRITES
"InnoDB freeze writes patch from Google"
${
WITH_WSREP
}
)
IF
(
WITH_INNODB_DISALLOW_WRITES
)
IF
(
WITH_INNODB_DISALLOW_WRITES
)
ADD_DEFINITIONS
(
-DWITH_INNODB_DISALLOW_WRITES
)
ADD_DEFINITIONS
(
-DWITH_INNODB_DISALLOW_WRITES
)
...
...
storage/mroonga/CMakeLists.txt
View file @
49f95c40
...
@@ -215,8 +215,7 @@ set(MYSQL_INCLUDE_DIRS
...
@@ -215,8 +215,7 @@ set(MYSQL_INCLUDE_DIRS
"
${
MYSQL_REGEX_INCLUDE_DIR
}
"
"
${
MYSQL_REGEX_INCLUDE_DIR
}
"
"
${
MYSQL_RAPIDJSON_INCLUDE_DIR
}
"
"
${
MYSQL_RAPIDJSON_INCLUDE_DIR
}
"
"
${
MYSQL_LIBBINLOGEVENTS_EXPORT_DIR
}
"
"
${
MYSQL_LIBBINLOGEVENTS_EXPORT_DIR
}
"
"
${
MYSQL_LIBBINLOGEVENTS_INCLUDE_DIR
}
"
"
${
MYSQL_LIBBINLOGEVENTS_INCLUDE_DIR
}
"
)
"
${
MYSQL_SOURCE_DIR
}
"
)
if
(
MRN_BUNDLED
)
if
(
MRN_BUNDLED
)
set
(
MYSQL_PLUGIN_DIR
"
${
INSTALL_PLUGINDIR
}
"
)
set
(
MYSQL_PLUGIN_DIR
"
${
INSTALL_PLUGINDIR
}
"
)
...
...
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