summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3->5.5 mergeSergei Golubchik2012-11-221-2/+2
|\
| * Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-46/+91
| |\
| | * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-46/+91
| | |\
| | | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-45/+90
| | | |\
| * | | \ Merge 5.2 -> 5.3unknown2012-11-011-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge 5.1 -> 5.2unknown2012-11-011-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_d...Michael Widenius2012-10-311-2/+2
| * | | | 5.2 mergeSergei Golubchik2012-05-201-15/+15
| |\ \ \ \ | | |/ / /
| | * | | 5.1 mergeSergei Golubchik2012-05-181-15/+15
| | |\ \ \ | | | |/ /
| | | * | merge with mysql-5.1.63Sergei Golubchik2012-05-171-15/+15
| | | |\ \
* | | | \ \ mysql-5.5.28Sergei Golubchik2012-10-161-61/+90
|\ \ \ \ \ \
| * \ \ \ \ \ mergeMattias Jonsson2012-08-201-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-201-1/+1
| * | | | | | mergeMattias Jonsson2012-08-201-18/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-171-18/+13
| * | | | | | manual merge 5.1->5.5Mattias Jonsson2012-08-151-37/+89
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#13025132 - PARTITIONS USE TOO MUCH MEMORYMattias Jonsson2012-08-151-37/+89
| | | |_|_|/ | | |/| | |
* | | | | | Fixed compiler errorsMichael Widenius2012-08-141-1/+1
* | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-1/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | bug#13949735: crash regression from bug#13694811.Mattias Jonsson2012-05-151-1/+11
* | | | | | Awoiding registering partiton engine underlying tables whan it has no sens.unknown2012-07-241-2/+13
* | | | | | fixed MySQL bug#53775:unknown2012-07-131-0/+116
* | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-92/+175
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-201-8/+4
| |\ \ \ \ \
| * \ \ \ \ \ merge of bug#1364811 into mysql-5.5Mattias Jonsson2012-03-141-91/+174
| |\ \ \ \ \ \
| | * | | | | | bug#13694811Mattias Jonsson2012-03-141-10/+4
| | * | | | | | Bug#13694811: THE OPTIMIZER WRONGLY USES THE FIRST INNODBMattias Jonsson2012-02-221-105/+195
| * | | | | | | merge from mysql-5.1Mattias Jonsson2012-02-291-33/+33
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | merge into mysql-5.1Mattias Jonsson2012-02-291-15/+15
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Bug#11761296: 53775: QUERY ON PARTITIONED TABLE RETURNS CACHEDMattias Jonsson2012-02-201-14/+14
| | |/ / / / /
* | | | | | | Merge of compatibility fixesMichael Widenius2012-04-021-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Automatic mergeMichael Widenius2012-03-281-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with 5.1Michael Widenius2012-03-281-2/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-2/+2
* | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-8/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ONMattias Jonsson2012-02-021-40/+36
| | |_|_|/ / | |/| | | |
* | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-0/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Added Handler_read_rnd_deleted, number of deleted rows found with ha_read_rnd...Michael Widenius2012-01-131-0/+2
* | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-45/+158
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-1/+2
| |\ \ \ \ \
| * | | | | | Bug#12696518: MEMORY LEAKS IN HA_PARTITION (VALGRIND TESTS ON TRUNK)Mattias Jonsson2011-09-151-44/+158
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-10/+50
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-10/+50
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-231-1/+19
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,Mattias Jonsson2011-08-231-1/+19
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-9/+31
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Updated/added copyright headersKent Boortz2011-07-031-140/+317
| | | | |\ \ \
| | | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
* | | | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-121-0/+1