summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
* | | | merge w/ 5.1Sergei Golubchik2010-10-291-0/+1
|\ \ \ \ | |/ / /
* | | | sane implementation of Key_% status variables.Sergei Golubchik2010-10-291-12/+0
* | | | 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
* | | | 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
* | | | Automerge with 5.1Michael Widenius2010-08-251-4/+4
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2010-08-241-4/+4
| |\ \ \
| | * | | Increase some very old limits.Michael Widenius2010-08-241-2/+2
| |/ / /
* | | | Merge with 5.2Michael Widenius2010-08-091-0/+1
|\ \ \ \ | |/ / /
| * | | Added --sync-sys=0 option for mysqld to skip sync() calls for faster testingMichael Widenius2010-08-091-0/+1
* | | | Added extra argument to longlong2str() to make it have same prototype is int2...Michael Widenius2010-08-071-2/+2
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-0510-48/+50
|\ \ \ \ | |/ / /
| * | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ...Michael Widenius2010-08-041-0/+2
| * | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-1/+1
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-028-37/+48
| |\ \ \ | | |/ /
| | * | Automerge.Alexey Kopytov2010-07-012-4/+4
| | |\ \
| | | * | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-012-4/+4
| | * | | Bug#54457: Test suite broken for 32-bit buildDavi Arnaut2010-06-281-2/+0
| | |/ /