Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 3 | -3/+19 |
|\ | |||||
| * | Merge 10.2 into bb-10.2-ext; also, fix MDEV-13015 After restart, InnoDB wrong... | Marko Mäkelä | 2017-06-15 | 2 | -3/+13 |
| |\ | |||||
| | * | MDEV-12471: BULK Command | Oleksandr Byelkin | 2017-06-14 | 2 | -3/+13 |
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -0/+6 |
| | |\ | |||||
| | | * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -0/+6 |
| | | |\ | |||||
| | | | * | MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf... | Sergei Golubchik | 2017-05-15 | 1 | -3/+6 |
| | | | * | WIP: global readonly variable pcre_frame_size | Daniel Black | 2017-05-15 | 1 | -0/+3 |
* | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Marko Mäkelä | 2017-06-02 | 17 | -105/+481 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 17 | -105/+481 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Sergei Golubchik | 2017-05-09 | 3 | -27/+75 |
| | * | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Georg Richter | 2017-05-09 | 2 | -4/+20 |
| | * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 2 | -4/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 2 | -4/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 2 | -4/+3 |
| | | | |\ | |||||
| | | | | * | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ... | Sergei Golubchik | 2017-04-20 | 2 | -2/+48 |
| | | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -3/+3 |
| | | | | |\ | |||||
| | | | | | * | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ... | Ramil Kalimullin | 2017-03-14 | 2 | -2/+5 |
| | | | | | * | BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING ... | Ramil Kalimullin | 2017-03-10 | 5 | -9/+19 |
| | | | | | * | Updated copyright year in user visible text | Balasubramanian Kandasamy | 2017-01-06 | 1 | -2/+2 |
| | | | | | * | BUG#24437124: POSSIBLE BUFFER OVERFLOW ON CREATE TABLE | Karthik Kamath | 2016-11-10 | 1 | -1/+2 |
| | | | | | * | Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLE | Jon Olav Hauglid | 2016-08-19 | 2 | -6/+8 |
| | | | | | * | Bug #23296299 : HANDLE_FATAL_SIGNAL (SIG=11) IN | Kailasnath Nagarkar | 2016-07-01 | 1 | -2/+2 |
| | * | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 13 | -88/+401 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | MDEV-11663 Create services for functionality used by plugins | Vladislav Vaintroub | 2017-04-27 | 12 | -88/+381 |
| | | * | | | | bugfix: federated/replication did not increment bytes_received status variable | Sergei Golubchik | 2017-04-27 | 1 | -0/+20 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.310.3-MDEV-10953 | Alexander Barkov | 2017-05-17 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-05-08 | 1 | -1/+3 |
| * | | | | | | Fixed compiler warnings and warnings from build.tags | Monty | 2017-05-08 | 1 | -1/+1 |
* | | | | | | | Fix that end_bulk_insert() doesn't write to to-be-deleted files | Monty | 2017-05-17 | 3 | -5/+5 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-24 | 13 | -47/+111 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 13 | -47/+111 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-19 | 3 | -3/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 3 | -3/+4 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-07 | 2 | -2/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-04-07 | 2 | -2/+9 |
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-05 | 2 | -25/+36 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-04-05 | 2 | -25/+36 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix the build on Windows. | Vladislav Vaintroub | 2017-04-02 | 1 | -0/+17 |
| | * | | | | | move rocksdb specific changes into rocksdb | Sergei Golubchik | 2017-03-31 | 1 | -17/+0 |
| | * | | | | | don't export all charsets to plugins | Sergei Golubchik | 2017-03-31 | 1 | -78/+78 |
| | * | | | | | remove my_hash_const_element(), use Hash_set in C++ code | Sergei Golubchik | 2017-03-31 | 1 | -1/+0 |
| | * | | | | | Merge 10.2 into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-31 | 37 | -1121/+1623 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 20 | -269/+325 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 3 | -103/+114 |
| | * | | | | | | | MariaRocks port: move include/atomic_stat.h into storage/rocksdb | Sergei Petrunia | 2017-01-21 | 1 | -94/+0 |
| | * | | | | | | | Merge branch '10.2' of github.com:MariaDB/server into 10.2-mariarocks | Sergei Petrunia | 2017-01-02 | 19 | -141/+537 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | MariaRocks: port my_hash_const_element | Sergei Petrunia | 2016-10-16 | 1 | -0/+1 |
| | * | | | | | | | | Backport from facebook/mysql-5.6: | Sergei Petrunia | 2016-10-09 | 1 | -0/+94 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-03 | 34 | -1117/+1618 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |