Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 2 | -0/+53 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 2 | -0/+53 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2018-06-20 | 2 | -0/+53 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-20 | 2 | -0/+53 |
| | | |\ | |||||
| | | | * | MDEV-16534 PPC64: Unexpected error with a negative value into auto-increment ... | Alexander Barkov | 2018-06-20 | 2 | -0/+54 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-06-18 | 2 | -0/+128 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-15352 AUTO_INCREMENT breaks after updating a column value to a negative ... | Alexander Barkov | 2018-06-14 | 2 | -0/+128 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 2 | -0/+25 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Add an end-marker to ease future merges | Marko Mäkelä | 2018-05-29 | 2 | -0/+3 |
| * | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 2 | -0/+22 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 2 | -0/+22 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 2 | -0/+22 |
* | | | | | Merge branch 'github/10.2' into 10.3 | Sergei Golubchik | 2018-05-22 | 2 | -0/+33 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-20 | 2 | -0/+33 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-19 | 4 | -0/+54 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables. | Monty | 2018-05-16 | 2 | -0/+21 |
| | | * | | MDEV-14943 Alter table ORDER BY bug | Monty | 2018-05-15 | 2 | -0/+33 |
* | | | | | MDEV-14669 Assertion `file->trn == trn' failed in ha_maria::start_stmt | Monty | 2018-05-16 | 2 | -0/+44 |
* | | | | | Don't report errors from open_table() twice | Michael Widenius | 2018-05-14 | 1 | -1/+0 |
* | | | | | Fixed alter online table for Aria tables | Monty | 2018-03-29 | 2 | -0/+24 |
* | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2018-02-22 | 2 | -0/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-02-22 | 2 | -0/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-02-22 | 2 | -0/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-02-22 | 2 | -0/+11 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_n... | Sergei Golubchik | 2018-02-14 | 2 | -0/+11 |
* | | | | | Added Max_index_length and Temporary to SHOW TABLE STATUS | Monty | 2018-02-12 | 4 | -45/+53 |
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 6 | -0/+198 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 6 | -0/+198 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 6 | -0/+198 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-11539 test_if_reopen: Assertion `strcmp(share->unique_file_name,filename... | Sergei Golubchik | 2018-01-25 | 2 | -0/+48 |
| | | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 4 | -0/+150 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-14690: Assertion `page_link == &fake_link' failed in pagecache_write_part | Oleksandr Byelkin | 2018-01-11 | 2 | -0/+26 |
| | | | * | MDEV-8200 aria bug with insert select and lock tables | Monty | 2018-01-11 | 2 | -0/+124 |
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Monty | 2018-01-21 | 2 | -0/+177 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed MDEV-14326 engine ARIA with row_format=FIXED is broken | Monty | 2018-01-18 | 2 | -0/+177 |
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 2 | -2/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 2 | -2/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 2 | -2/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 2 | -2/+10 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-13530 VARBINARY doesn't convert to to BLOB for sizes 65533, 65534 and 65535 | Alexander Barkov | 2017-10-13 | 2 | -2/+10 |
* | | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-09-23 | 2 | -0/+21 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables. | Monty | 2017-09-21 | 2 | -0/+21 |
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record' | Monty | 2017-05-17 | 1 | -0/+3 |
* | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -2/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Adjusted test results after the fix for mdev-12429. | Igor Babaev | 2017-04-07 | 1 | -2/+2 |
* | | | | | MDEV-12546 Wrong metadata or data type for string user variables | Alexander Barkov | 2017-05-24 | 1 | -136/+136 |
|/ / / / |