Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+29 |
|\ | |||||
| * | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -7/+7 |
| |\ \ | |||||
| * | | | MW-322 CTAS fix | sjaakola | 2017-07-20 | 1 | -1/+1 |
| * | | | MW-322 - CTAS fix merged to 5.5-v25 branch | sjaakola | 2017-07-20 | 1 | -0/+29 |
| * | | | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -6/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -3/+13 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -16/+40 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-01-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Bug #26881946: INCORRECT BEHAVIOR WITH "VALUES" | Sreeharsha Ramanavarapu | 2017-11-16 | 1 | -1/+7 |
| | | * | | | | | | | BUG#23135731: INSERT WITH DUPLICATE KEY UPDATE REPORTS | Nisha Gopalakrishnan | 2016-04-22 | 1 | -7/+16 |
* | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | MDEV-9619: Assertion `null_ref_table' failed in virtual table_map Item_direct... | Oleksandr Byelkin | 2017-10-13 | 1 | -7/+7 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | MDEV-10365 - Race condition in error handling of INSERT DELAYED | Sergey Vojtovich | 2016-08-04 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -10/+38 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | use consistent error messaging for IGNORE | Sergei Golubchik | 2016-04-20 | 1 | -8/+5 |
| | * | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-04-20 | 1 | -5/+9 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | BUG#22037930: INSERT IGNORE FAILS TO IGNORE FOREIGN KEY | Nisha Gopalakrishnan | 2016-02-11 | 1 | -4/+8 |
| * | | | | | | Fix for MDEV-9679 main.delayed fails sporadically | Monty | 2016-04-26 | 1 | -2/+28 |
| * | | | | | | MDEV-8889 - Assertion `next_insert_id == 0' failed in handler::ha_external_lock | Sergey Vojtovich | 2016-04-22 | 1 | -2/+3 |
* | | | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(ta... | Oleksandr Byelkin | 2016-02-09 | 1 | -0/+2 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -3/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -3/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -3/+13 |
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | |||||
| | | * | | Bug #19894161: FATAL SIGNAL 11 IN | Sreeharsha Ramanavarapu | 2015-10-06 | 1 | -3/+13 |
* | | | | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -17/+40 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -1/+0 |
| * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -16/+40 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-10-08 | 1 | -16/+40 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'mysql-5.1' into mysql-5.5 | Ajo Robert | 2015-08-07 | 1 | -15/+41 |
| | | |\ \ | |||||
| | | | * | | Bug #20760261 mysqld crashed in materialized_cursor:: | Ajo Robert | 2015-08-07 | 1 | -15/+40 |
| | | | * | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
| | | | * | | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -10/+9 |
| | | * | | | Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, | Venkatesh Duggirala | 2014-05-08 | 1 | -1/+3 |
| | | * | | | WL#7076: Backporting wl6715 to support both formats | Ashish Agarwal | 2013-08-23 | 1 | -2/+3 |
| | | |\ \ \ | |||||
| | | | * | | | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -2/+3 |
| | | |/ / / | |||||
| | | * | | | Bug#14261010: ON DUPLICATE KEY UPDATE CRASHES THE SERVER | Chaithra Gopalareddy | 2013-03-30 | 1 | -40/+45 |
| | | * | | | Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 | Sneha Modi | 2011-11-21 | 1 | -4/+4 |
| | | * | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-11-10 | 1 | -0/+5 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEY | Marko Mäkelä | 2011-11-10 | 1 | -0/+5 |