summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-042-1/+4
* Merge with 5.1-release.Michael Widenius2010-12-0611-22/+119
|\
| * Automatic mergeMichael Widenius2010-12-041-1/+0
| |\
| | * Merge with 5.1Michael Widenius2010-12-041-3/+2
| | |\
| * | \ mergeVladislav Vaintroub2010-12-021-2/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-1/+2
| * | merge with 5.1Michael Widenius2010-11-307-16/+102
| |\ \ | | |/
| | * Merge with MySQL 5.1.53Michael Widenius2010-11-253-8/+54
| | |\
| | | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-1/+12
| | | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-1/+2
| | | * Bug#52172 test binlog.binlog_index needs --skip-core-file to avoid leaving co...Tor Didriksen2010-10-181-4/+47
| | * | Merge with MySQL 5.1.52Michael Widenius2010-11-233-4/+39
| | |\ \ | | | |/
| | | * mergeGeorgi Kodinov2010-10-051-2/+35
| | | |\
| | | | * Bug #56428: Replace copyright notice removed from SHA1 code (.h)Georgi Kodinov2010-10-051-2/+35
| | | * | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-072-2/+4
| * | | | Merge MariaDB 5.1->5.2unknown2010-11-194-4/+15
| |\ \ \ \ | | |/ / /
| | * | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th...Michael Widenius2010-11-074-4/+15
* | | | | Automerge with 5.2Michael Widenius2010-11-052-7/+16
|\ \ \ \ \ | |/ / / /
| * | | | Automatic merge with 5.1Michael Widenius2010-11-042-7/+16
| |\ \ \ \ | | |/ / /
| | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-022-7/+16
* | | | | mergeSergei Golubchik2010-11-021-12/+1
|\ \ \ \ \
| * \ \ \ \ merge w/ 5.2Sergei Golubchik2010-11-021-12/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge w/ 5.1Sergei Golubchik2010-10-291-0/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-12/+0
* | | | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_...Michael Widenius2010-11-021-1/+2
|/ / / / /
* | | | | 5.2 mergeSergei Golubchik2010-10-281-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Sergei Golubchik2010-10-251-2/+3
| |\ \ \ \ | | |/ / /
| | * | | 5.1.51 mergeSergei Golubchik2010-10-191-2/+3
| | |\ \ \ | | | |/ /
| | | * | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-2/+3
| | | * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-041-1/+1
| | | * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-031-1/+1
* | | | | Post-merge fixes part 1Sergey Petrunya2010-10-101-1/+1
* | | | | Merge 5.2->5.3Sergey Petrunya2010-10-1024-126/+254
|\ \ \ \ \ | |/ / / /
| * | | | Automatic merge with 5.1Michael Widenius2010-10-061-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i...Michael Widenius2010-10-061-2/+2
| * | | | fixes for gcc 4.5Sergei Golubchik2010-09-285-5/+6
| * | | | Move maria_upgrade() out of maria_init() as in standalone programs maria_data...Michael Widenius2010-09-281-0/+1
| * | | | Rename control file and log files from maria_xxx to aria_xxx when upgrading f...Michael Widenius2010-09-271-3/+3
| * | | | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-142-6/+9
| * | | | merge with 5.1Sergei Golubchik2010-09-1110-55/+170
| |\ \ \ \ | | |/ / /
| | * | | to simpliy and unify the codeSergei Golubchik2010-09-111-27/+17
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-279-56/+177
| | |\ \ \ | | | |/ /
| | | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-3/+6
| | | * | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-202-1/+2
| | | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-142-2/+4
| | | * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-143-4/+128
| | | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-11/+0
| | | * | Bug#22320: my_atomic-t unit test failsDavi Arnaut2010-07-058-426/+3
| | | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-4/+4
| | | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-023-44/+14
View Lorry Controller Status