Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-19 | 1 | -1/+2 |
|\ | |||||
| * | MDEV-14315 -- Reflect use of tcmalloc in a system variable and error log | Vesa Pentti | 2017-12-18 | 1 | -1/+2 |
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+1 |
| |\ | |||||
| | * | make sql_udf.cc to shorten dlerror() messages | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-02-27 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | move check_user/set_user from mysqld.cc to mysys | Sergei Golubchik | 2016-12-22 | 1 | -2/+2 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-02-06 | 1 | -0/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Make atomic writes general | Sergei Golubchik | 2017-01-11 | 1 | -0/+1 |
| * | | | | Improve mysys/hash by caching hash_nr | Monty | 2017-01-11 | 1 | -0/+4 |
* | | | | | MDEV-11212 - Clean-up MariaDB atomic operations | Sergey Vojtovich | 2016-12-13 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 1 | -1/+2 |
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 1 | -2/+1 |
* | | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 1 | -1/+2 |
* | | | | MDEV-9872 - Add common optimized CRC32 function interface | Sergey Vojtovich | 2016-08-04 | 1 | -1/+1 |
|/ / / | |||||
* | | | MDEV-6479 stack traces in 10.1 | Sergei Golubchik | 2015-02-28 | 1 | -1/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -2/+1 |
| | |\ | |||||
| | | * | Backport from trunk: | Tor Didriksen | 2014-05-07 | 1 | -2/+1 |
* | | | | MDEV 4427: query timeouts | Monty | 2014-10-07 | 1 | -1/+7 |
* | | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -4/+0 |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+4 |
|/ / / | |||||
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBR... | Sreedhar.S | 2013-10-09 | 1 | -0/+5 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -3/+9 |
|\ \ \ | |/ / | |||||
| * | | MDEV-4472 Audit-plugin. Server-related part of the task. | Alexey Botchkov | 2013-09-09 | 1 | -1/+1 |
| * | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -1/+6 |
| |\ \ | | |/ | |||||
| | * | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8 | Tor Didriksen | 2013-06-14 | 1 | -1/+6 |
* | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+3 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -2/+4 |
|/ / | |||||
* | | Fix FreeBSD test errors. Also link with libexecinfo on FreeBSD for stacktrac... | Vladislav Vaintroub | 2012-05-04 | 1 | -1/+1 |
* | | MDEV-15 Log SQL errors. | Alexey Botchkov | 2012-03-14 | 1 | -1/+1 |
* | | MDEV-15 Log all SQL errors. | Alexey Botchkov | 2012-03-14 | 1 | -1/+1 |
* | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -0/+1 |
* | | | - Always compile my_new.cc and safemalloc.c with mysys | Vladislav Vaintroub | 2012-01-20 | 1 | -9/+1 |
* | | | Fix embedded build on Windows. | Vladislav Vaintroub | 2012-01-20 | 1 | -1/+1 |
* | | | - Fix rpl_checksum test. Use basename of file in error messages, not the o | Vladislav Vaintroub | 2012-01-20 | 1 | -2/+11 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -4/+3 |
| | | | |\ \ \ | |||||
| * | | | \ \ \ | merge | Sergei Golubchik | 2011-10-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / |