Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into bb-10.0-merge | Oleksandr Byelkin | 2018-07-17 | 1 | -0/+2 |
|\ | |||||
| * | A test cleanup for MDEV-15834: fixing failure in "mtr --embedded" | Alexander Barkov | 2018-06-26 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-19 | 2 | -0/+26 |
|\ \ | |/ | |||||
| * | MDEV-15834 The code in TABLE_SHARE::init_from_binary_frm_image() is not safe | Alexander Barkov | 2018-06-19 | 2 | -0/+26 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 2 | -0/+39 |
|\ \ | |/ | |||||
| * | MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value | Alexander Barkov | 2017-10-06 | 2 | -0/+39 |
* | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 2 | -0/+141 |
|\ \ | |/ | |||||
| * | MDEV-11525 Assertion `cp + len <= buff + buff_size' failed in JOIN_CACHE::wri... | Sergei Golubchik | 2017-02-27 | 2 | -0/+141 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-01-17 | 2 | -0/+96 |
|\ \ | |/ | |||||
| * | bugfix: Item_func_min_max stored thd internally | Sergei Golubchik | 2017-01-15 | 2 | -0/+26 |
| * | bugfix: cmp_item_row::alloc_comparators() allocated on the wrong arena | Sergei Golubchik | 2017-01-15 | 2 | -7/+16 |
| * | MDEV-9690 concurrent queries with virtual columns crash in temporal code | Sergei Golubchik | 2017-01-15 | 2 | -0/+61 |
* | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-01-14 | 5 | -3/+40 |
|\ \ | |/ | |||||
| * | MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATE | Sergei Golubchik | 2017-01-12 | 2 | -0/+18 |
| * | MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || bitmap... | Sergei Golubchik | 2017-01-11 | 3 | -3/+22 |
* | | add a test case vcol.charsets | Sergei Golubchik | 2016-07-12 | 2 | -0/+55 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 3 | -0/+79 |
|\ \ | |/ | |||||
| * | MDEV-9093 Persistent computed column is not updated when update query contain... | Oleksandr Byelkin | 2016-02-05 | 3 | -0/+79 |
* | | MDEV-9045 Inconsistent handling of "ALGORITHM=INPLACE" with PERSISTENT genera... | Sergei Golubchik | 2016-02-15 | 2 | -0/+75 |
* | | XtraDB/InnoDB crash with autoinc, vcol and online alter | Sergei Golubchik | 2016-02-15 | 2 | -0/+25 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -0/+15 |
|\ \ | |/ | |||||
| * | MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns al... | Sergei Golubchik | 2015-12-11 | 2 | -0/+15 |
* | | MDEV-7968 Virtual column set to NULL using load data infile | Sergei Golubchik | 2015-07-27 | 2 | -0/+33 |
* | | 5.5 merge | Sergei Golubchik | 2014-11-19 | 2 | -0/+125 |
|\ \ | |/ | |||||
| * | MDEV-7113 difference between check_vcol_func_processor and check_partition_fu... | Sergei Golubchik | 2014-11-18 | 2 | -0/+125 |
* | | MDEV-6103 - Adding/removing non-materialized virtual column triggers | Sergey Vojtovich | 2014-06-03 | 3 | -0/+44 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 2 | -0/+12 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 2 | -0/+12 |
| |\ \ | | |/ | |||||
| | * | Merge 5.3->5.5 | Igor Babaev | 2014-02-10 | 2 | -0/+12 |
| | |\ | |||||
| | | * | Fixed bug mdev-5611. | Igor Babaev | 2014-02-07 | 2 | -0/+12 |
| * | | | MDEV-5244: Make extended_keys=ON by default in 10.0 | Sergey Petrunya | 2014-02-25 | 1 | -1/+1 |
* | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 2 | -0/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 2 | -0/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 5.3->5.5. | Igor Babaev | 2013-08-18 | 2 | -0/+19 |
| | |\ \ | | | |/ | |||||
| | | * | Merge 5.2->5.3 | Igor Babaev | 2013-08-15 | 2 | -0/+19 |
| | | |\ | |||||
| | | | * | MDEV-4823: Server crashes in Item_func_not::fix_fields on creating a table wi... | unknown | 2013-08-01 | 2 | -0/+15 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 12 | -12/+12 |
|\ \ \ \ \ | |||||
| * | | | | | fix lost vcol checks in sql_table.cc, | Sergei Golubchik | 2013-07-12 | 12 | -12/+12 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -0/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -0/+4 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -0/+4 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 2 | -0/+30 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 2 | -0/+30 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 2 | -0/+30 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 2 | -0/+30 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Corrected the test case for bug mdev-3938. | Igor Babaev | 2013-01-19 | 2 | -0/+3 |
| | | | * | Fixed bug mdev-3938. | Igor Babaev | 2013-01-15 | 2 | -0/+28 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 4 | -1/+122 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -1/+1 |
| |/ / / |