Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -10/+3 |
|\ | |||||
| * | don't do vio_description(NULL) | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -9/+2 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -9/+2 |
| | |\ | |||||
| | | * | MDEV-11933 Wrong usage of linked list in mysql_prune_stmt_list | Sergei Golubchik | 2017-02-27 | 1 | -9/+2 |
* | | | | fix the ABI and stop slave hang problem | vinchen | 2016-10-21 | 1 | -2/+8 |
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-subm | Sergei Golubchik | 2016-09-21 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #232 from 0xAX/no-need-to-zero-vio-net | Sergey Vojtovich | 2016-09-12 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| | * | | | | no need to set net->vio to zero in mysql_real_connect | Alexander Kuleshov | 2016-09-09 | 1 | -1/+0 |
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -1/+4 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -1/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0 | Oleksandr Byelkin | 2016-08-16 | 1 | -1/+2 |
| | | * | | MDEV-10455: libmariadbclient18 + MySQL-python leaks memory on failed connections | Oleksandr Byelkin | 2016-08-11 | 1 | -1/+3 |
* | | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 1 | -5/+8 |
|/ / / / | |||||
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 1 | -8/+5 |
* | | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 1 | -5/+8 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -15/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -15/+31 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -15/+31 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -4/+18 |
| | | |\ | |||||
| | | | * | Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BE | Arun Kuruvila | 2016-03-01 | 1 | -4/+19 |
* | | | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -2/+2 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-02-25 | 1 | -32/+57 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -32/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -32/+57 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 1 | -32/+57 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM | Yashwant Sahu | 2016-01-11 | 1 | -26/+64 |
| | * | | | Merge MDEV-9112 into 10.0 | Kristian Nielsen | 2016-02-01 | 1 | -0/+1 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge MDEV-9112 into 10.1 | Kristian Nielsen | 2016-02-01 | 1 | -0/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | MDEV-9112: Non-blocking client API missing on non-x86 platforms | Georg Richter | 2016-02-01 | 1 | -0/+1 |
* | | | | | MDEV-9117: Client Server capability negotiation for MariaDB specific function... | Oleksandr Byelkin | 2016-02-02 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -27/+28 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -27/+28 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-9212 ssl-validate-cert incorrect hostname check | Sergei Golubchik | 2015-12-08 | 1 | -27/+28 |
| * | | | Fixed compiler warnings | Monty | 2015-11-23 | 1 | -4/+0 |
* | | | | compilation warning | Sergei Golubchik | 2015-11-19 | 1 | -4/+0 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -185/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-9041 connect-timeout has no effect on Windows | Vladislav Vaintroub | 2015-11-05 | 1 | -185/+4 |
* | | | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-09-01 | 1 | -1/+1 |
* | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -7/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -7/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-7937: Enforce SSL when --ssl client option is used | Vicențiu Ciorbaru | 2015-06-09 | 1 | -4/+19 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -2/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -2/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-7859 SSL hostname verification fails for long subject names | Sergei Golubchik | 2015-04-27 | 1 | -2/+10 |
* | | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -2/+1 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 | Sergei Golubchik | 2015-02-11 | 1 | -2/+2 |
| | |\ \ | | | |/ |