| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
| |\ | |||||
| | * | MDEV-14267: correct FSF address | Daniel Black | 2018-10-30 | 1 | -1/+1 |
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -2/+4 |
| |\ \ | |/ | |||||
| | * | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2018-08-28 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Copy of | Sergei Petrunia | 2018-08-28 | 1 | -2/+7 |
| * | | | Merge branch 'github/10.2' into 10.3 | Sergei Golubchik | 2018-05-22 | 1 | -0/+3 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-15304: Server crash in print_keydup_error / key_unpack or unexpected ER_... | Sergei Petrunia | 2018-05-18 | 1 | -0/+3 |
| * | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-12 | 1 | -10/+186 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'bb-10.2-mariarocks-merge' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2018-05-07 | 1 | -10/+186 |
| | |\ \ | |||||
| | | * \ | Merge from merge-myrocks: | Sergei Petrunia | 2018-01-27 | 1 | -10/+186 |
| | | |\ \ | | | |/ | |||||
| | | | * | Copy of | Sergei Petrunia | 2018-01-27 | 1 | -10/+186 |
| * | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-23 | 1 | -4/+4 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | MyRocks: MDEV-15911: Reduce debug logging on default levels in error log | Sergei Petrunia | 2018-04-19 | 1 | -4/+4 |
| * | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2018-02-23 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2018-02-22 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | fix compilation wih -DPLUGIN_PARTITION=NO | Sergei Golubchik | 2018-02-22 | 1 | -1/+1 |
| | | |/ / | |||||
| * | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-13 | 1 | -1/+26 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-13 | 1 | -1/+26 |
| | |\ \ \ | | |/ / | |||||
| | | * | | MDEV-14372: Fix and enable rocksdb.information_schema test | Sergei Petrunia | 2018-01-12 | 1 | -1/+26 |
| * | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-04 | 1 | -1/+2 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Monty | 2018-01-01 | 1 | -1/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Removed curr_bitmap_pos++ from possible macro | Monty | 2017-12-28 | 1 | -1/+2 |
| * | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | MDEV-14293: MyRocks lacks basic functionality | Sergei Petrunia | 2017-12-15 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -58/+328 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -4/+7 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2 | Sergei Petrunia | 2017-10-13 | 1 | -4/+7 |
| | | |\ \ | |||||
| | | | * | | Enable basic XA between MyRocks and the binlog | Sergei Petrunia | 2017-08-25 | 1 | -4/+7 |
| | * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -54/+321 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-19 | 1 | -0/+1 |
| | | |\ \ \ | | | |/ / | |||||
| | | * | | | Merge mergetrees/merge-myrocks into bb-10.2-mariarocks-merge | Sergei Petrunia | 2017-09-18 | 1 | -349/+1190 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Copy of | Sergei Petrunia | 2017-09-15 | 1 | -43/+314 |
| * | | | | | Changed KEY names to use LEX_CSTRING | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
| * | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-08-07 | 1 | -313/+888 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished. | Sergei Petrunia | 2017-07-29 | 1 | -313/+888 |
| | |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | | * | Copy of | Sergei Petrunia | 2017-07-28 | 1 | -314/+874 |
| | * | | MDEV-12469: static_assert cannot be determined on bigendian | Daniel Black | 2017-04-25 | 1 | -1/+1 |
| * | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+1 |
| * | | | storage/rocksdb/rdb_datadic.cc failed to compile on big endian machines (wron... | Alexander Barkov | 2017-04-08 | 1 | -1/+1 |
| * | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-04-07 | 1 | -4/+4 |
| |/ / | |||||
| * | | don't export all charsets to plugins | Sergei Golubchik | 2017-03-31 | 1 | -10/+11 |
| * | | Post-merge fixes | Sergei Petrunia | 2017-03-31 | 1 | -4/+6 |
| * | | Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-ma... | Sergei Petrunia | 2017-03-11 | 1 | -82/+170 |
| |\ \ | |/ | |||||
| | * | Copy of | Sergei Petrunia | 2017-03-11 | 1 | -82/+170 |
| * | | MariaRocks: fix compilation on Oracle Linux Server 7.3. | Sergei Petrunia | 2017-03-10 | 1 | -0/+3 |
| * | | Merge between local changes bb-10.2-mariarocks and the merge from upstream | Sergei Petrunia | 2017-02-20 | 1 | -6/+6 |
| |\ \ | |||||
| | * | | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 1 | -6/+6 |
| * | | | Merge 'merge-myrocks' into 'bb-10.2-mariarocks' | Sergei Petrunia | 2017-02-19 | 1 | -1947/+1519 |
| |\ \ \ | |/ / |/| / | |/ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |