Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+3 |
|\ | |||||
| * | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo... | Alexander Barkov | 2016-11-29 | 1 | -0/+3 |
* | | MDEV-10759 Fix Aria to support 2-byte collation IDs | Monty | 2016-12-02 | 2 | -2/+2 |
* | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 2 | -18/+0 |
|\ \ | |||||
| * \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 4 | -22/+3 |
| |\ \ | | |/ | |||||
| | * | MDEV-10951 Field_newdate::cmp access violation | Vladislav Vaintroub | 2016-10-25 | 2 | -18/+0 |
| * | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 3 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 3 | -2/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 2 | -2/+2 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 2 | -4/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 2 | -4/+3 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | MDEV-10725 Server 10.1.17 fails to build using clang with c++11 | Sergei Golubchik | 2016-09-26 | 1 | -2/+1 |
| | * | | | | don't use my_copystat in the server | Sergei Golubchik | 2016-09-12 | 1 | -2/+2 |
* | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed "Packets out of order" warning message on stdout in clients, | Monty | 2016-08-21 | 2 | -2/+2 |
* | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | [MDEV-9127] Crash reporter often fails to show the query that crashed | Vicențiu Ciorbaru | 2016-07-12 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 |