Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 2 | -2/+3 |
|\ | |||||
| * | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 3 | -2/+9 |
| |\ | |||||
| | * | Fixed compilation failure using clang | Vicențiu Ciorbaru | 2016-06-14 | 1 | -1/+2 |
| | * | MDEV-10166 probes_mysql_nodtrace.h is not provided anymore by mariadb-10.0.25 | Sergei Golubchik | 2016-06-14 | 1 | -0/+6 |
| | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -1/+1 |
| | |\ | |||||
| | | * | BUG#22594514: HANDLE_FATAL_SIGNAL (SIG=11) IN | Nisha Gopalakrishnan | 2016-03-17 | 1 | -2/+2 |
| | | * | WL#9072: Backport WL#8785 to 5.5 | Ramil Kalimullin | 2016-02-19 | 3 | -5/+27 |
| | * | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows. | Vladislav Vaintroub | 2016-06-08 | 1 | -1/+1 |
* | | | | MDEV-10262 ucs2_thai_520_w2: wrong implicit weights on the secondary level | Alexander Barkov | 2016-06-21 | 1 | -0/+1 |
* | | | | Multi-level collation in UCA, Thai sorting with contraction for UTF8. | pruet | 2016-05-26 | 1 | -1/+1 |
* | | | | Merge branch 'bb-10.1-merge' into 10.1 | Sergei Golubchik | 2016-05-05 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | MDEV-9926 probes_mysql.h includes nonexisting files | Sergei Golubchik | 2016-05-05 | 1 | -0/+6 |
* | | | | | MDEV-9618 solaris sparc build fails on 10.1. | Alexey Botchkov | 2016-05-04 | 5 | -0/+42 |
|/ / / / | |||||
* | | | | Fixed wrong counting of global Memory_used | Monty | 2016-04-28 | 6 | -6/+13 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update AskMonty and Atlassian references to MariaDB | iangilfillan | 2016-03-08 | 1 | -1/+1 |
| * | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | | Fix to ensure updates in gtid_slave_state table do not get binlogged. | Nirbhay Choubey | 2016-02-24 | 1 | -3/+3 |
* | | | | Merge branch 'bb-10.1-serg' into 10.1 | Sergei Golubchik | 2016-02-24 | 5 | -19/+17 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -0/+9 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 6 | -21/+14 |
| | |\ \ \ \ | | | |/ / / | |||||
| * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 4 | -19/+8 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24 | Sergei Golubchik | 2016-02-17 | 3 | -18/+7 |
| | |\ \ \ \ | |||||
| | | * | | | | MDEV-9308 Fix build errors with recent gcc (isfinite) | Sergei Golubchik | 2016-02-17 | 1 | -0/+3 |
| | | * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 3 | -18/+4 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | dtrace in cmake | Sergei Golubchik | 2016-02-15 | 1 | -0/+0 |
| | | | * | | | better inline check | Sergei Golubchik | 2016-02-15 | 1 | -14/+0 |
| | | | * | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 1 | -3/+3 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Updated copyright year in user visible text | Bjorn Munch | 2016-01-11 | 1 | -2/+2 |
| | | | | * | | Bug#21770366 backport bug#21657078 to 5.5 and 5.6 | Ajo Robert | 2016-01-07 | 1 | -8/+4 |
| | | | | * | | Bug #21221862 NEWEST RHEL/CENTOS OPENSSL UPDATE BREAKS MYSQL DHE CIPHERS | V S Murthy Sidagam | 2015-06-19 | 1 | -2/+2 |
| | | | | * | | Raise version number after cloning 5.5.42 | Bala | 2015-01-05 | 1 | -2/+2 |
| | | | * | | | MDEV-9024 Build fails with VS2015 | Sergei Golubchik | 2016-02-06 | 1 | -0/+2 |
| | | | * | | | MDEV-9466 : Exception handler on Windows does not output any text, | Vladislav Vaintroub | 2016-02-03 | 1 | -1/+1 |
| | * | | | | | MDEV-9511 Valgrind warnings 'Invalid read' in Field_newdate::cmp and Field_ne... | Alexander Barkov | 2016-02-17 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge MDEV-9112 into 10.0 | Kristian Nielsen | 2016-02-01 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
* | | | | | | MDEV-7231 Field ROUTINE_DEFINITION in INFORMATION_SCHEMA.`ROUTINES` | Alexander Barkov | 2016-02-24 | 1 | -0/+13 |
|/ / / / / | |||||
* | | | | | cleanup | Sergei Golubchik | 2016-02-23 | 1 | -0/+9 |
* | | | | | Fixes needed to compile with musl C library | Monty | 2016-02-07 | 1 | -2/+4 |
* | | | | | Merge MDEV-9112 into 10.1 | Kristian Nielsen | 2016-02-01 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | MDEV-9112: Non-blocking client API missing on non-x86 platforms | Georg Richter | 2016-02-01 | 1 | -1/+1 |
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-01-25 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows. | Vladislav Vaintroub | 2016-01-07 | 1 | -1/+1 |
* | | | | | stack too small on labrador (again!) | Sergei Golubchik | 2016-01-25 | 1 | -1/+1 |
* | | | | | Revert "Fixed compilation failure on MacOSX" | Vicențiu Ciorbaru | 2016-01-17 | 1 | -2/+1 |
* | | | | | Fixed compilation failure on MacOSX | Vicențiu Ciorbaru | 2016-01-17 | 1 | -1/+2 |
* | | | | | remove HA_ERR_INFO, use ER_ALTER_INFO | Sergei Golubchik | 2015-12-23 | 2 | -4/+2 |
* | | | | | Don't send error 0 to my_printf_error() | Monty | 2015-12-23 | 2 | -2/+4 |
* | | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 2 | -1/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 7 | -6/+14 |
| |\ \ \ \ |