summaryrefslogtreecommitdiff
path: root/plugin
Commit message (Expand)AuthorAgeFilesLines
* Merge from 5.2Alexander Barkov2013-07-091-1/+1
|\
| * Merge from 5.1Alexander Barkov2013-07-091-1/+1
| |\
| | * Bug #69682 - mysqld crashes after uninstall of plugin with "first" status varSergei Golubchik2013-07-061-1/+1
* | | 5.2->5.3 mergeSergei Golubchik2013-01-102-0/+9
|\ \ \ | |/ /
| * | Fix broken feedback plugin after MDEV-712.Vladislav Vaintroub2012-11-261-0/+3
| * | merge 5.1Vladislav Vaintroub2012-11-221-0/+6
| |\ \ | | |/
| | * Feedback plugin now recognizes Windows 8 / Windows Server 2012.Vladislav Vaintroub2012-11-221-0/+6
* | | Merge MariaDB 5.2->5.3unknown2012-11-201-3/+6
|\ \ \ | |/ /
| * | Merge MariaDB 5.1->5.2.unknown2012-11-201-3/+6
| |\ \ | | |/
| | * potential crash in the feedback pluginSergei Golubchik2012-11-191-3/+6
* | | mergeSergei Golubchik2012-09-272-15/+98
|\ \ \ | |/ /
| * | a simple pam user mapper moduleSergei Golubchik2012-09-252-15/+98
* | | Compatibility fixes by U OrsiniMichael Widenius2012-03-301-0/+1
* | | Add missing include (fixes compile failure with gcc 4.7).unknown2012-03-291-0/+1
* | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+4
* | | Merge with MariaDB 5.2Michael Widenius2012-02-211-0/+1
|\ \ \ | |/ /
| * | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-0/+1
| |\ \ | | |/
| | * report innodb_file_per_table, innodb_flush_log_at_trx_commit, innodb_flush_me...Sergei Golubchik2012-01-041-0/+1
* | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-013-22/+35
|\ \ \ | |/ /
| * | lp:901693 dialog.c:perform_dialog treats every password prompt as firstSergei Golubchik2012-01-121-0/+2
| * | openpam compatibilitySergei Golubchik2012-01-121-2/+2
| * | plugin renamed socket_peercred -> unix_socket.Sergei Golubchik2011-12-301-17/+1
| * | Fixed compiler and test failures found by buildbotMichael Widenius2012-01-081-3/+30
* | | 5.2->5.3 mergeSergei Golubchik2011-12-128-47/+263
|\ \ \ | |/ /
| * | PAM plugin with testSergei Golubchik2011-12-024-0/+237
| * | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-024-47/+26
* | | Merge with 5.2.Michael Widenius2011-12-116-14/+17
|\ \ \ | |/ /
| * | merge, fix Windows warningsVladislav Vaintroub2011-11-291-1/+2
| * | Automatic mergeMichael Widenius2011-11-243-3/+4
| |\ \
| | * \ Merge with MariaDB 5.1Michael Widenius2011-11-246-17/+25
| | |\ \ | | | |/
| | | * Automatic mergeMichael Widenius2011-11-213-3/+4
| | | |\
| | | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-213-3/+4
| | | | |\
| | | | | * Updated/added copyright headersKent Boortz2011-07-031-2/+2
| | | | | |\
| | | | | * | Updated/added copyright headersKent Boortz2011-06-302-2/+3
| * | | | | | fix dialog plugin to work on windowsSergei Golubchik2011-11-222-10/+11
* | | | | | | 5.2->5.3 mergeSergei Golubchik2011-11-141-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.1->5.2 mergeSergei Golubchik2011-11-131-2/+8
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | don't make feedback_plugin_send.test as 'big'Sergei Golubchik2011-11-131-2/+8
* | | | | | | 5.2->5.3 mergeSergei Golubchik2011-11-131-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.1-5.2 mergeSergei Golubchik2011-11-131-4/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | increase feedback plugin versionSergei Golubchik2011-11-121-1/+1
* | | | | | | 5.2->5.3 mergeSergei Golubchik2011-11-121-8/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.1 mergeSergei Golubchik2011-11-121-8/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | feedback plugin:Sergei Golubchik2011-11-121-8/+9
| | | |/ / / | | |/| | |
* | | | | | merge 5.2Vladislav Vaintroub2011-10-191-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge from 5.1Vladislav Vaintroub2011-10-191-1/+1
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | silence the "uninitialized" warningSergei Golubchik2011-10-131-1/+1
* | | | | typo.Sergei Golubchik2011-10-131-1/+1
* | | | | fix a compilation failure for perl Net::HandlerSocket moduleSergei Golubchik2011-10-124-3/+9
* | | | | mergeSergei Golubchik2011-10-1110-0/+1547
|\ \ \ \ \ | |/ / / /