Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-11-21 | 1 | -5/+2 |
|\ | |||||
| * | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2017-11-10 | 1 | -4/+7 |
| |\ | |||||
| | * | MW-394 | Jan Lindström | 2017-11-08 | 1 | -2/+2 |
| | * | MW-394 | sjaakola | 2017-11-08 | 1 | -4/+6 |
| | * | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -1/+1 |
| | |\ | |||||
* | | | | Fix some conversion warnings. | Vladislav Vaintroub | 2017-09-30 | 1 | -1/+1 |
* | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
* | | | | MDEV-13384 Fix Windows warnings. thd_alloc functions now use size_t parameters | Vladislav Vaintroub | 2017-09-28 | 1 | -5/+5 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -4/+4 |
* | | | | MW-394 | sjaakola | 2017-09-15 | 1 | -3/+9 |
* | | | | MDEV-12731 | andrelkin | 2017-09-04 | 1 | -0/+1 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-08-31 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | MDEV-13693 : Fix parameter passing to my_error. | Vladislav Vaintroub | 2017-08-31 | 1 | -1/+1 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -0/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix test failure on test MW-86 and remove MW-360 test. | Jan Lindström | 2017-08-15 | 1 | -6/+0 |
| | * | | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo... | sjaakola | 2017-08-11 | 1 | -1/+4 |
| | * | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -8/+16 |
| | |\ \ | | | |/ | |||||
| | * | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Fix galera tests part II(Fix previous commit) | Sachin Setiya | 2017-05-08 | 1 | -1/+1 |
| | * | | | Fix galera test failures. | Sachin Setiya | 2017-05-08 | 1 | -1/+1 |
| | * | | | Fix compiler warnings on gcc 6.x. | Jan Lindström | 2017-04-05 | 1 | -1/+1 |
| | * | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -1/+6 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
* | | | | | | | Fix threadpool to report connections aborted due to wait timeout. | Vladislav Vaintroub | 2017-08-30 | 1 | -0/+3 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -7/+24 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -6/+4 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | MDEV-11896 thd_get_error_context_description race condition | Sergei Golubchik | 2017-07-20 | 1 | -6/+4 |
| * | | | | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -9/+22 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-08 | 1 | -2/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-07-07 | 1 | -2/+10 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-07-06 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | sql_class: incorrect assignment in Security_context::destroy | Daniel Black | 2017-07-04 | 1 | -1/+1 |
| | * | | | | | | Fix for MDEV-13191. Assert for !is_set() when doing LOAD DATA | Monty | 2017-07-02 | 1 | -1/+9 |
* | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-06-30 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-06-28 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | MDEV-13187 incorrect backslash parsing in clients | Sergei Golubchik | 2017-06-27 | 1 | -0/+2 |
| * | | | | | | MDEV-13012 Assertion `share->error' failed in discover_handlerton upon execut... | Sergei Golubchik | 2017-06-22 | 1 | -1/+1 |
* | | | | | | | MDEV-11639 Server crashes in update_virtual_field, gcol.innodb_virtual_basic ... | Sergei Golubchik | 2017-07-05 | 1 | -0/+8 |
* | | | | | | | MDEV-12070 - Introduce thd_query_safe() from MySQL 5.7 | Sergey Vojtovich | 2017-06-26 | 1 | -8/+29 |
* | | | | | | | Remove the unnecessary method handlerton::release_temporary_latches() | Marko Mäkelä | 2017-06-16 | 1 | -14/+0 |
* | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+1 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Remove compile warning - "this" canot be null | Daniel Black | 2017-04-30 | 1 | -1/+1 |
| * | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -1/+1 |
| | | |\ \ \ |