mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
MDEV-19275 Provide SQL service to plugins.
test_sql_service plugin added and employed in test_sql_service.test.
This commit is contained in:
parent
82bc007ffb
commit
0ccdf8b11b
10 changed files with 630 additions and 3 deletions
mysql-test/suite/plugins
plugin/test_sql_service
sql
8
mysql-test/suite/plugins/r/test_sql_service.result
Normal file
8
mysql-test/suite/plugins/r/test_sql_service.result
Normal file
|
@ -0,0 +1,8 @@
|
|||
install plugin test_sql_service soname 'test_sql_service';
|
||||
set global test_sql_service_run_test= 1;
|
||||
show status like 'test_sql_service%';
|
||||
Variable_name Value
|
||||
Test_sql_service_passed 0
|
||||
uninstall plugin test_sql_service;
|
||||
Warnings:
|
||||
Warning 1620 Plugin is busy and will be uninstalled on shutdown
|
2
mysql-test/suite/plugins/t/test_sql_service.opt
Normal file
2
mysql-test/suite/plugins/t/test_sql_service.opt
Normal file
|
@ -0,0 +1,2 @@
|
|||
--thread_handling='one-thread-per-connection'
|
||||
|
18
mysql-test/suite/plugins/t/test_sql_service.test
Normal file
18
mysql-test/suite/plugins/t/test_sql_service.test
Normal file
|
@ -0,0 +1,18 @@
|
|||
|
||||
--source include/not_embedded.inc
|
||||
|
||||
if (!$TEST_SQL_SERVICE_SO) {
|
||||
skip No TEST_SQL_SERVICE plugin;
|
||||
}
|
||||
|
||||
# An unfortunate wait for check-testcase.test to complete disconnect.
|
||||
let count_sessions= 1;
|
||||
source include/wait_until_count_sessions.inc;
|
||||
|
||||
install plugin test_sql_service soname 'test_sql_service';
|
||||
|
||||
set global test_sql_service_run_test= 1;
|
||||
show status like 'test_sql_service%';
|
||||
|
||||
uninstall plugin test_sql_service;
|
||||
|
18
plugin/test_sql_service/CMakeLists.txt
Normal file
18
plugin/test_sql_service/CMakeLists.txt
Normal file
|
@ -0,0 +1,18 @@
|
|||
# Copyright (C) 2013 Alexey Botchkov and SkySQL Ab
|
||||
#
|
||||
# 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 Foundation; version 2 of the License.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
|
||||
|
||||
SET(SOURCES test_sql_service.c)
|
||||
|
||||
MYSQL_ADD_PLUGIN(test_sql_service ${SOURCES} MODULE_ONLY RECOMPILE_FOR_EMBEDDED)
|
339
plugin/test_sql_service/COPYING
Normal file
339
plugin/test_sql_service/COPYING
Normal file
|
@ -0,0 +1,339 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
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 Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
145
plugin/test_sql_service/test_sql_service.c
Normal file
145
plugin/test_sql_service/test_sql_service.c
Normal file
|
@ -0,0 +1,145 @@
|
|||
/* Copyright (C) 2019, Alexey Botchkov and MariaDB Corporation
|
||||
|
||||
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 Foundation; version 2 of the License.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
|
||||
|
||||
|
||||
#define PLUGIN_VERSION 0x100
|
||||
#define PLUGIN_STR_VERSION "1.0.0"
|
||||
|
||||
#define _my_thread_var loc_thread_var
|
||||
|
||||
#include <my_config.h>
|
||||
#include <assert.h>
|
||||
#include <my_global.h>
|
||||
#include <my_base.h>
|
||||
#include <typelib.h>
|
||||
//#include <mysql_com.h> /* for enum enum_server_command */
|
||||
#include <mysql/plugin.h>
|
||||
#include <mysql/plugin_audit.h>
|
||||
//#include <string.h>
|
||||
|
||||
|
||||
LEX_STRING * thd_query_string (MYSQL_THD thd);
|
||||
unsigned long long thd_query_id(const MYSQL_THD thd);
|
||||
size_t thd_query_safe(MYSQL_THD thd, char *buf, size_t buflen);
|
||||
const char *thd_user_name(MYSQL_THD thd);
|
||||
const char *thd_client_host(MYSQL_THD thd);
|
||||
const char *thd_client_ip(MYSQL_THD thd);
|
||||
LEX_CSTRING *thd_current_db(MYSQL_THD thd);
|
||||
int thd_current_status(MYSQL_THD thd);
|
||||
enum enum_server_command thd_current_command(MYSQL_THD thd);
|
||||
|
||||
int maria_compare_hostname(const char *wild_host, long wild_ip, long ip_mask,
|
||||
const char *host, const char *ip);
|
||||
void maria_update_hostname(const char **wild_host, long *wild_ip, long *ip_mask,
|
||||
const char *host);
|
||||
|
||||
/* Status variables for SHOW STATUS */
|
||||
static long test_passed= 0;
|
||||
static struct st_mysql_show_var test_sql_status[]=
|
||||
{
|
||||
{"test_sql_service_passed", (char *)&test_passed, SHOW_LONG},
|
||||
{0,0,0}
|
||||
};
|
||||
|
||||
static my_bool do_test= TRUE;
|
||||
static void run_test(MYSQL_THD thd, struct st_mysql_sys_var *var,
|
||||
void *var_ptr, const void *save);
|
||||
static MYSQL_SYSVAR_BOOL(run_test, do_test, PLUGIN_VAR_OPCMDARG,
|
||||
"Perform the test now.", NULL, run_test, FALSE);
|
||||
static struct st_mysql_sys_var* test_sql_vars[]=
|
||||
{
|
||||
MYSQL_SYSVAR(run_test),
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
extern int execute_sql_command(const char *command,
|
||||
char *hosts, char *names, char *filters);
|
||||
|
||||
|
||||
|
||||
static int do_tests()
|
||||
{
|
||||
char plugins[1024];
|
||||
char names[1024];
|
||||
char dl[2048];
|
||||
int result;
|
||||
|
||||
result= execute_sql_command("select 'plugin', name, dl from mysql.plugin",
|
||||
plugins, names, dl);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static void run_test(MYSQL_THD thd __attribute__((unused)),
|
||||
struct st_mysql_sys_var *var __attribute__((unused)),
|
||||
void *var_ptr __attribute__((unused)),
|
||||
const void *save __attribute__((unused)))
|
||||
{
|
||||
test_passed= do_tests();
|
||||
}
|
||||
|
||||
|
||||
static int init_done= 0;
|
||||
|
||||
static int test_sql_service_plugin_init(void *p __attribute__((unused)))
|
||||
{
|
||||
init_done= 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int test_sql_service_plugin_deinit(void *p __attribute__((unused)))
|
||||
{
|
||||
if (!init_done)
|
||||
return 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static struct st_mysql_audit maria_descriptor =
|
||||
{
|
||||
MYSQL_AUDIT_INTERFACE_VERSION,
|
||||
NULL,
|
||||
auditing,
|
||||
{ MYSQL_AUDIT_GENERAL_CLASSMASK |
|
||||
MYSQL_AUDIT_TABLE_CLASSMASK |
|
||||
MYSQL_AUDIT_CONNECTION_CLASSMASK }
|
||||
};
|
||||
maria_declare_plugin(test_sql_service)
|
||||
{
|
||||
MYSQL_AUDIT_PLUGIN,
|
||||
&maria_descriptor,
|
||||
"TEST_SQL_SERVICE",
|
||||
"Alexey Botchkov (MariaDB Corporation)",
|
||||
"Test SQL service",
|
||||
PLUGIN_LICENSE_GPL,
|
||||
test_sql_service_plugin_init,
|
||||
test_sql_service_plugin_deinit,
|
||||
PLUGIN_VERSION,
|
||||
test_sql_status,
|
||||
test_sql_vars,
|
||||
PLUGIN_STR_VERSION,
|
||||
MariaDB_PLUGIN_MATURITY_STABLE
|
||||
}
|
||||
maria_declare_plugin_end;
|
||||
|
|
@ -1355,7 +1355,7 @@ bool LOGGER::slow_log_print(THD *thd, const char *query, size_t query_length,
|
|||
my_hrtime_t current_time= { hrtime_from_time(thd->start_time) +
|
||||
thd->start_time_sec_part + query_utime };
|
||||
|
||||
if (!query)
|
||||
if (!query || thd->get_command() == COM_STMT_PREPARE)
|
||||
{
|
||||
is_command= TRUE;
|
||||
query= command_name[thd->get_command()].str;
|
||||
|
|
|
@ -1211,6 +1211,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
|
|||
Query_arena execute_arena(&execute_mem_root, STMT_INITIALIZED_FOR_SP),
|
||||
backup_arena;
|
||||
query_id_t old_query_id;
|
||||
CSET_STRING old_query;
|
||||
TABLE *old_derived_tables;
|
||||
TABLE *old_rec_tables;
|
||||
LEX *old_lex;
|
||||
|
@ -1291,6 +1292,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
|
|||
be able properly do close_thread_tables() in instructions.
|
||||
*/
|
||||
old_query_id= thd->query_id;
|
||||
old_query= thd->query_string;
|
||||
old_derived_tables= thd->derived_tables;
|
||||
thd->derived_tables= 0;
|
||||
old_rec_tables= thd->rec_tables;
|
||||
|
@ -1567,6 +1569,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success)
|
|||
old_change_list.move_elements_to(thd);
|
||||
thd->lex= old_lex;
|
||||
thd->set_query_id(old_query_id);
|
||||
thd->set_query_inner(old_query);
|
||||
DBUG_ASSERT(!thd->derived_tables);
|
||||
thd->derived_tables= old_derived_tables;
|
||||
thd->rec_tables= old_rec_tables;
|
||||
|
|
|
@ -14679,3 +14679,40 @@ maria_declare_plugin(mysql_password)
|
|||
MariaDB_PLUGIN_MATURITY_STABLE /* Maturity */
|
||||
}
|
||||
maria_declare_plugin_end;
|
||||
|
||||
|
||||
/*
|
||||
Exporting functions that allow plugins to do server-style
|
||||
host/user matching. Used in server_audit2 plugin.
|
||||
*/
|
||||
extern "C" int maria_compare_hostname(
|
||||
const char *wild_host, long wild_ip, long ip_mask,
|
||||
const char *host, const char *ip)
|
||||
{
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
acl_host_and_ip h;
|
||||
h.hostname= (char *) wild_host;
|
||||
h.ip= wild_ip;
|
||||
h.ip_mask= ip_mask;
|
||||
|
||||
return compare_hostname(&h, host, ip);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
extern "C" void maria_update_hostname(
|
||||
const char **wild_host, long *wild_ip, long *ip_mask,
|
||||
const char *host)
|
||||
{
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
acl_host_and_ip h;
|
||||
update_hostname(&h, host);
|
||||
*wild_host= h.hostname;
|
||||
*wild_ip= h.ip;
|
||||
*ip_mask= h.ip_mask;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2618,6 +2618,15 @@ void mysqld_stmt_prepare(THD *thd, const char *packet, uint packet_length)
|
|||
|
||||
if (stmt->prepare(packet, packet_length))
|
||||
{
|
||||
/*
|
||||
Prepare failed and stmt will be freed.
|
||||
Now we have to save the query_string in the so the
|
||||
audit plugin later gets the meaningful notification.
|
||||
*/
|
||||
if (alloc_query(thd, stmt->query_string.str(), stmt->query_string.length()))
|
||||
{
|
||||
thd->set_query(0, 0);
|
||||
}
|
||||
/* Statement map deletes statement on erase */
|
||||
thd->stmt_map.erase(stmt);
|
||||
thd->clear_last_stmt();
|
||||
|
@ -2752,6 +2761,7 @@ bool Lex_prepared_stmt::get_dynamic_sql_string(THD *thd,
|
|||
void mysql_sql_stmt_prepare(THD *thd)
|
||||
{
|
||||
LEX *lex= thd->lex;
|
||||
CSET_STRING orig_query= thd->query_string;
|
||||
const LEX_CSTRING *name= &lex->prepared_stmt.name();
|
||||
Prepared_statement *stmt;
|
||||
LEX_CSTRING query;
|
||||
|
@ -2822,7 +2832,16 @@ void mysql_sql_stmt_prepare(THD *thd)
|
|||
thd->m_statement_psi,
|
||||
stmt->name.str, stmt->name.length);
|
||||
|
||||
if (stmt->prepare(query.str, (uint) query.length))
|
||||
bool res= stmt->prepare(query.str, (uint) query.length);
|
||||
/*
|
||||
stmt->prepare() sets thd->query_string with the prepared
|
||||
query, so the audit plugin gets adequate notification with the
|
||||
mysqld_stmt_* set of functions.
|
||||
But here we should restore the original query so it's mentioned in
|
||||
logs properly.
|
||||
*/
|
||||
thd->set_query(orig_query);
|
||||
if (res)
|
||||
{
|
||||
/* Statement map deletes the statement on erase */
|
||||
thd->stmt_map.erase(stmt);
|
||||
|
@ -2841,6 +2860,7 @@ void mysql_sql_stmt_prepare(THD *thd)
|
|||
void mysql_sql_stmt_execute_immediate(THD *thd)
|
||||
{
|
||||
LEX *lex= thd->lex;
|
||||
CSET_STRING orig_query= thd->query_string;
|
||||
Prepared_statement *stmt;
|
||||
LEX_CSTRING query;
|
||||
DBUG_ENTER("mysql_sql_stmt_execute_immediate");
|
||||
|
@ -2889,6 +2909,14 @@ void mysql_sql_stmt_execute_immediate(THD *thd)
|
|||
thd->free_items();
|
||||
thd->free_list= free_list_backup;
|
||||
|
||||
/*
|
||||
stmt->execute_immediately() sets thd->query_string with the executed
|
||||
query, so the audit plugin gets adequate notification with the
|
||||
mysqld_stmt_* set of functions.
|
||||
But here we should restore the original query so it's mentioned in
|
||||
logs properly.
|
||||
*/
|
||||
thd->set_query_inner(orig_query);
|
||||
stmt->lex->restore_set_statement_var();
|
||||
delete stmt;
|
||||
DBUG_VOID_RETURN;
|
||||
|
@ -3205,6 +3233,13 @@ static void mysql_stmt_execute_common(THD *thd,
|
|||
if (!(stmt= find_prepared_statement(thd, stmt_id)))
|
||||
{
|
||||
char llbuf[22];
|
||||
/*
|
||||
Did not find the statement with the provided stmt_id.
|
||||
Set thd->query_string with the stmt_id so the
|
||||
audit plugin gets the meaningful notification.
|
||||
*/
|
||||
if (alloc_query(thd, llbuf, strlen(llbuf)))
|
||||
thd->set_query(0, 0);
|
||||
my_error(ER_UNKNOWN_STMT_HANDLER, MYF(0), static_cast<int>(sizeof(llbuf)),
|
||||
llstr(stmt_id, llbuf), "mysqld_stmt_execute");
|
||||
DBUG_VOID_RETURN;
|
||||
|
@ -3969,6 +4004,19 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
|
|||
DBUG_RETURN(TRUE);
|
||||
}
|
||||
|
||||
/*
|
||||
We'd like to have thd->query to be set to the actual query
|
||||
after the function ends.
|
||||
This value will be sent to audit plugins later.
|
||||
As the statement is created, the query will be stored
|
||||
in statement's arena. Normally the statement lives longer than
|
||||
the end of this query, so we can just set thd->query_string to
|
||||
be the stmt->query_string.
|
||||
Though errors can result in statement to be freed. These cases
|
||||
should be handled appropriately.
|
||||
*/
|
||||
stmt_backup.query_string= thd->query_string;
|
||||
|
||||
old_stmt_arena= thd->stmt_arena;
|
||||
thd->stmt_arena= this;
|
||||
|
||||
|
@ -4504,6 +4552,15 @@ Prepared_statement::reprepare()
|
|||
*/
|
||||
thd->get_stmt_da()->clear_warning_info(thd->query_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
Prepare failed and the 'copy' will be freed.
|
||||
Now we have to restore the query_string in the so the
|
||||
audit plugin later gets the meaningful notification.
|
||||
*/
|
||||
thd->set_query(query(), query_length());
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
|
@ -5127,7 +5184,7 @@ public:
|
|||
|
||||
Protocol_local(THD *thd_arg, ulong prealloc= 0) :
|
||||
Protocol_text(thd_arg, prealloc),
|
||||
cur_data(0), first_data(0), data_tail(&first_data)
|
||||
cur_data(0), first_data(0), data_tail(&first_data), alloc(0)
|
||||
{}
|
||||
|
||||
protected:
|
||||
|
|
Loading…
Add table
Reference in a new issue