summaryrefslogtreecommitdiff
path: root/include/my_base.h
Commit message (Expand)AuthorAgeFilesLines
* Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-106/+106
* cleanup: fix a commentSergei Golubchik2016-12-121-1/+1
* misc after-merge changes:Sergei Golubchik2016-09-101-26/+8
* Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-081-1/+12
* MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-311-5/+1
* Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-4/+4
|\
| * MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-061-4/+4
* | MDEV-8764: Wrong error when encrypted table can't be decrypted.Jan Lindström2015-09-141-1/+3
* | remove Aria-only handler flagSergei Golubchik2015-04-081-2/+1
* | encryption cleanup: small changesSergei Golubchik2015-04-051-1/+1
* | Push for testing of encryptionMonty2015-02-101-0/+2
* | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-2/+0
|/
* merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM"Sergei Golubchik2014-05-071-1/+2
* 10.0-base mergeSergei Golubchik2014-02-031-1/+2
|\
| * 5.5 mergeSergei Golubchik2014-02-011-3/+4
| |\
| | * Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-221-1/+2
* | | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-5/+0
* | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-3/+1
* | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1Sergei Golubchik2013-11-281-9/+9
* | | MDEV-5241: Collation incompatibilities with MySQL-5.6Michael Widenius2013-11-091-0/+5
* | | 10.0-monty mergeSergei Golubchik2013-07-211-9/+49
|\ \ \ | |/ / |/| |
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-9/+49
* | | * frm extra2 segment.Sergei Golubchik2013-04-091-1/+1
* | | remove ha_create_table_from_engine()Sergei Golubchik2013-04-091-1/+1
* | | * don't use 1-8 numbers for open_table_error codes, use an enum.Sergei Golubchik2013-04-091-1/+1
|/ /
* | The patch for the task mdev-539.Igor Babaev2012-12-201-0/+6
* | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+3
|\ \ | |/
| * Fixed bug mdev-3851.Igor Babaev2012-11-111-0/+3
* | Merge with 5.5Michael Widenius2012-05-311-8/+10
|\ \ | |/
| * cSergei Golubchik2012-05-211-8/+9
| |\
| | * Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-02-271-5/+6
* | | Added text for errno in error messages by:Michael Widenius2012-05-301-9/+11
|/ /
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-7/+9
|\ \ | |/
| * Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZEMarko Mäkelä2011-09-011-1/+2
| * Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-161-2/+3
| * Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+5
| | |\
| | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | fixes for windowsSergei Golubchik2011-10-211-3/+0
* | | | merge with 5.3Sergei Golubchik2011-10-191-3/+7
|\ \ \ \
| * | | | Added HA_ERR_DISK_FULL handler errorMichael Widenius2011-05-181-1/+2
| * | | | MRR interface: change range_info's type from char* to range_id_t typedef. The...Sergey Petrunya2011-03-041-1/+3
| * | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...Michael Widenius2011-02-181-1/+2
| * | | | Added support for NO_RECORD record format (don't store any row data) for Aria.Sergei Golubchik2011-01-141-1/+1
* | | | | 5.5-mergeSergei Golubchik2011-07-021-8/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. Jimmy Yang2011-05-311-1/+2
| * | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-4/+2
| * | | | BUG#59013, make partition handler not miss HA_STATUS_NO_LOCK, add HA_STATUS_V...Mikael Ronstrom2010-12-171-1/+6
* | | | | merge.Sergei Golubchik2010-11-251-14/+36
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Automatic merge with 5.1Michael Widenius2010-11-041-0/+2
| |\ \ \
View Lorry Controller Status