mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
181527 commits 2784 branches 343 tags 1.6 GiB
Commit graph

821 commits

Author SHA1 Message Date
Marko Mäkelä
081fd8bfa2 Merge 10.1 into 10.2 2019-02-02 11:40:02 +02:00
Oleksandr Byelkin
a3a4ea9355 postmerge rollbacks and fixes 2019-01-31 19:28:38 +01:00
Marko Mäkelä
32062cc61c Merge 10.1 into 10.2 2018-11-06 08:41:48 +02:00
Daniel Black
3859273d04 MDEV-14267: correct FSF address 2018-10-30 19:45:09 +08:00
Vladislav Vaintroub
5a5bc21a65 auth_gssapi : Fix string formatting in my_printf_error() 2018-10-16 09:19:03 +01:00
Vladislav Vaintroub
952f394f8e remove MYF flags from plugin 2018-10-16 09:17:03 +01:00
Vladislav Vaintroub
ea9c407e0b Fix regular expression in replace_regex in auth_gssapi test. 2018-10-15 23:07:30 +01:00
Vladislav Vaintroub
64b48aebe4 make auth_gssapi_basic work, also in domain environment. 2018-10-15 22:57:15 +01:00
Vladislav Vaintroub
311126758e MDEV-17462 Heap corruption with auth_gssapi on Windows. 
use FreeContextAttributes() on individual members of
SecPkgContext_NativeNames, not on the struct itself.
 2018-10-15 22:11:14 +01:00
Vladislav Vaintroub
753117fed0 AWS KMS plugin : more detailed message when API calls fail. 
Output API function name, exception name, exception text
 2018-10-03 23:59:08 +02:00
Marko Mäkelä
206528f722 Merge 10.1 into 10.2 2018-08-31 15:10:02 +03:00
Alexey Botchkov
c933970974 MDEV-16665 ed25519 describes itself as 1.0-alpha even though it's not alpha. 
Plugin version name fixed.
 2018-08-30 15:57:22 +04:00
Alexey Botchkov
2ad51a0bd8 MDEV-17095 pam_user_map module throws syntax error if group name contains backslash. 
Let '\\' and '/' symbols to be part of a group name.
 2018-08-30 14:51:15 +04:00
Sergei Golubchik
1dd3c8f8ba Merge branch '10.1' into 10.2 2018-06-28 22:46:12 +02:00
Sergei Golubchik
16c14d7ba0 mark ed25519 stable 2018-06-28 15:46:57 +02:00
Sergei Golubchik
df704b5a1b don't use my_error(0) or my_printf_error(0) 
there's an assert that catches it
 2018-06-21 10:15:27 +02:00
Marko Mäkelä
82f0dc35aa Merge 10.1 into 10.2 2018-05-11 18:33:58 +03:00
Alexey Botchkov
dab4abbb09 MDEV-15480 Audit plugin does not respect QUERY_DML for audit plugin. 
QUERY_DML_NO_SELECT flag added.
 2018-05-10 19:23:35 +04:00
Sergei Golubchik
c764bc0a78 Merge branch '10.1' into 10.2 2018-03-25 13:02:52 +02:00
Alexey Botchkov
0b74a1fa64 MDEV-14533 Provide information_schema tables using which hardware 
information can be obtained.

plugin only enabled for Linux, as it fails building on BSD/MacOSX.
disks.test fixed.
 2018-03-24 00:37:38 +04:00
Alexey Botchkov
3b644ac1f7 MDEV-14533 Provide information_schema tables using which hardware 
information can be obtained.

disks.test moved to plugin's directory.
 2018-03-24 00:30:28 +04:00
Sergei Golubchik
b6e2973ee6 MDEV-14533 Provide information_schema tables using which hardware information can be obtained. 
update README, use maria_declare_plugin(), specify the author.
 2018-03-23 00:55:19 +01:00
Alexey Botchkov
f5b2761c70 MDEV-10871 Add logging capability to pam_user_map.c. 
The 'debug' option implemented for the pam_user_map.so.
 2018-03-23 00:18:21 +04:00
Marko Mäkelä
3d7915f000 Merge 10.1 into 10.2 2018-03-21 22:58:52 +02:00
Alexey Botchkov
9652038453 MDEV-14533 Provide information_schema tables using which hardware 
information can be obtained.

        DISKS plugin implementation added to the tree.
 2018-03-21 12:33:38 +04:00
Sergei Golubchik
4771ae4b22 Merge branch 'github/10.1' into 10.2 2018-02-06 14:50:50 +01:00
Vladislav Vaintroub
27733c8b12 auth_gssapi - fix test result and let the test run on Windows buildbot 2018-02-01 12:50:58 +00:00
Vladislav Vaintroub
9891ee5a2a Fix and reenable Windows compiler warning C4800 (size_t conversion). 2018-01-26 10:37:46 +00:00
Marko Mäkelä
843e4508c0 Merge 10.1 into 10.2 2017-11-07 23:02:39 +02:00
Alexey Botchkov
6ceb49a941 MDEV-13921 Audit log writes invalid SQL if single-line comments are 
present.

        thread_pool_server_audit.test fixed.
        plugin version updated.
 2017-11-03 22:43:51 +04:00
Alexey Botchkov
3a3f1328fe MDEV-13921 Audit log writes invalid SQL if single-line comments are 
present.

        Escape special characters (like \r \n \t) instead of
        replacing them with spaces.
 2017-11-03 17:15:55 +04:00
Sergei Golubchik
e0a1c745ec Merge branch '10.1' into 10.2 2017-10-24 14:53:18 +02:00
Sergei Golubchik
9d2e2d7533 Merge branch '10.0' into 10.1 2017-10-22 13:03:41 +02:00
Sergei Golubchik
da4503e956 Merge branch '5.5' into 10.0 2017-10-18 15:14:39 +02:00
Sergei Golubchik
d76f5774fe MDEV-13459 Warnings, when compiling with gcc-7.x 
mostly caused by -Wimplicit-fallthrough
 2017-10-17 07:37:39 +02:00
Vladislav Vaintroub
dd85ec6f28 Update AWS C++ SDK version 
This fixes some truncation warnings on Win64
 2017-10-11 08:45:59 +02:00
Marko Mäkelä
6ca35c1428 Replace a non-ASCII character in a comment 2017-10-04 08:07:41 +03:00
Vladislav Vaintroub
4732767981 Fix Windows warnings : fix server_audit not to use my_win_open and Co 
functions.

There is no reason to export IO this functionality from server, if it can
be easily implemented with CRT.

Note: for the sake of compatibility, we do not use _open() on Windows,
but open file with CreateFile, with FILE_SHARE_DELETE flag,
so it can be renamed or deleted when open. Also atomic append flag is used.
 2017-10-03 19:42:16 +00:00
Vladislav Vaintroub
7354dc6773 MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
Vicențiu Ciorbaru
2d9f5f69d4 Merge branch '10.1' into 10.2 2017-09-20 10:46:09 +03:00
Alexey Botchkov
99fbf3eb59 MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF; 
The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG
        notification. So we have to suppress the log_current_query()
        in this case.
 2017-09-19 14:01:12 +04:00
Alexey Botchkov
389f7cdf3c MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF; 
The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG
        notification. So we have to suppress the log_current_query()
        in this case.
 2017-09-19 13:43:36 +04:00
Alexey Botchkov
a47d16907d MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF; 
The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG
        notification. So we have to suppress the log_current_query()
        in this case.
 2017-09-19 13:08:24 +04:00
Sergei Golubchik
7e56e9ea77 MDEV-13650 Backport fix for MDEV-13060 (crash when both AWS plugin and server_audit are loaded) to 10.1 
MDEV-13060 Server Audit Plugin Crashes with AWS KMS plugin

don't do auditing if thd is NULL.

Collaterals:
* copy-paste bugs server_audit.c
 2017-09-18 10:40:26 +02:00
Marko Mäkelä
70db1e3b8a Merge 10.1 into 10.2 2017-09-06 19:28:51 +03:00
Marko Mäkelä
cd694d76ce Merge 10.0 into 10.1 2017-09-06 15:32:56 +03:00
Marko Mäkelä
7f99381288 Fix compiler warnings 
metadata_lock_info_duration[]: Remove the unused variable.

Add some comments /* fall through */ to silence -Wimplicit-fallthrough
 2017-09-01 15:40:49 +03:00
Marko Mäkelä
a36c369bda Merge 10.1 into 10.2 
For running the Galera tests, the variable my_disable_leak_check
was set to true in order to avoid assertions due to memory leaks
at shutdown.

Some adjustments due to MDEV-13625 (merge InnoDB tests from MySQL 5.6)
were performed. The most notable behaviour changes from 10.0 and 10.1
are the following:

* innodb.innodb-table-online: adjustments for the DROP COLUMN
behaviour change (MDEV-11114, MDEV-13613)

* innodb.innodb-index-online-fk: the removal of a (1,NULL) record
from the result; originally removed in MySQL 5.7 in the
Oracle Bug #16244691 fix
377774689b

* innodb.create-index-debug: disabled due to MDEV-13680
(the MySQL Bug #77497 fix was not merged from 5.6 to 5.7.10)

* innodb.innodb-alter-autoinc: MariaDB 10.2 behaves like MySQL 5.6/5.7,
while MariaDB 10.0 and 10.1 assign different values when
auto_increment_increment or auto_increment_offset are used.
Also MySQL 5.6/5.7 exhibit different behaviour between
LGORITHM=INPLACE and ALGORITHM=COPY, so something needs to be tested
and fixed in both MariaDB 10.0 and 10.2.

* innodb.innodb-wl5980-alter: disabled because it would trigger an
InnoDB assertion failure (MDEV-13668 may need additional effort in 10.2)
 2017-08-31 09:30:40 +03:00
Jan Lindström
01209de763 Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1 2017-08-29 20:30:18 +03:00
Vladislav Vaintroub
dda40b9304 AWS Key Management : Introduce "mock" variable, available in debug build. 
If this variable is set, skip actual AWS calls, and fake/mock
both generation and encryption of the keys.

The advantage of having a mock mode is that more aws_key_management tests
can be enabled on buildbot.
 2017-08-28 18:28:07 +00:00