Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -0/+143 |
|\ | |||||
| * | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -0/+143 |
| |\ | |||||
| | * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -0/+143 |
| | |\ | |||||
| | | * | crash with too long index comments | Sergei Golubchik | 2018-01-18 | 1 | -0/+143 |
* | | | | Merge branch 'bb-10.2-serg-merge' into 10.2 | Sergei Golubchik | 2017-02-11 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -0/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -0/+9 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -0/+9 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-10274 Bundling insert with create statement for table with unsigned Deci... | Alexey Botchkov | 2016-12-19 | 1 | -0/+9 |
* | | | | | MDEV-7635: Update tests to adapt to the new default sql_mode | Nirbhay Choubey | 2017-02-10 | 1 | -0/+5 |
|/ / / / | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-11231 Server crashes in check_duplicate_key on CREATE TABLE ... SELECT | Sergei Golubchik | 2016-12-04 | 1 | -0/+6 |
* | | | | MDEV-6112 multiple triggers per table | Monty | 2016-10-05 | 1 | -1/+0 |
* | | | | MDEV-5535: Cannot reopen temporary table | Nirbhay Choubey | 2016-06-10 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -0/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -0/+21 |
| |\ \ | | |/ | |||||
| | * | MDEV-7765: Crash (Assertion `!table || (!table->write_set || bitmap_is_set(ta... | Oleksandr Byelkin | 2016-02-09 | 1 | -0/+21 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -0/+8 |
| |\ \ | | |/ | |||||
| | * | MDEV-7050: MySQL#74603 - Assertion `comma_length > 0' failed in mysql_prepare... | Jan Lindström | 2015-12-07 | 1 | -0/+8 |
* | | | MDEV-9021: MYSQLD SEGFAULTS WHEN BUILT USING --WITH-MAX-INDEXES=128 | Nirbhay Choubey | 2015-11-09 | 1 | -331/+0 |
* | | | MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibili... | Alexander Barkov | 2015-09-22 | 1 | -3/+3 |
* | | | MDEV-7286 TRIGGER: CREATE OR REPLACE, CREATE IF NOT EXISTS | Alexander Barkov | 2015-03-04 | 1 | -1/+7 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2014-11-19 | 1 | -1/+32 |
|\ \ | |/ | |||||
| * | MDEV-6179: dynamic columns functions/cast()/convert() doesn't play nice with ... | Sergei Golubchik | 2014-11-08 | 1 | -0/+32 |
* | | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -0/+2 |
* | | MDEV-4880 Attempt to create a table without columns produces ER_ILLEGAL_HA in... | Sergei Golubchik | 2013-11-10 | 1 | -0/+7 |
* | | MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_... | Sergei Golubchik | 2013-11-04 | 1 | -0/+1 |
* | | revert | Sergei Golubchik | 2013-04-09 | 1 | -16/+13 |
* | | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -0/+24 |
|\ \ | |/ | |||||
| * | Fixed the CREATE TABLE IF EXIST generates warnings instead of errors | Michael Widenius | 2012-12-17 | 1 | -3/+0 |
| * | Removed lock wait timeout warning when using CREATE TABLE IF EXISTS | Michael Widenius | 2012-12-16 | 1 | -0/+6 |
| * | Implemented MDEV-3941: CREATE TABLE xxx IF NOT EXISTS should not block if tab... | Michael Widenius | 2012-12-16 | 1 | -0/+21 |
* | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -2/+2 |
|/ | |||||
* | pbxt suite is now a main-pbxt overlay | Sergei Golubchik | 2012-02-29 | 1 | -1/+1 |
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+26 |
|\ | |||||
| * | merge | Vladislav Vaintroub | 2011-05-12 | 1 | -0/+25 |
| |\ | |||||
| | * | Bugfix: New table creation/renaming block added if old encoded table present. | unknown | 2011-05-11 | 1 | -0/+25 |
* | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -51/+6 |
|\ \ \ | |/ / | |||||
| * | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -2/+2 |
| |/ | |||||
| * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -5/+4 |
| |\ | |||||
| * | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -46/+0 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+17 |
| |\ \ | |||||
| * \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+23 |
| |\ \ \ | |||||
| * | | | | Added some changes inspired by Zardosht Kasheff: | Michael Widenius | 2009-06-30 | 1 | -2/+2 |
| * | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -11/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+180 |
| |\ \ \ \ \ \ \ |