summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Automatic merge with 5.1Michael Widenius2011-05-041-1/+1
|\
| * Fixed compiler warningMichael Widenius2011-05-041-1/+1
* | Automatic merge with MariaDB 5.1Michael Widenius2011-05-034-6/+5
|\ \ | |/
| * Automatic mergeMichael Widenius2011-05-032-4/+2
| |\
| | * Fixed after-merge failures found by buildbotMichael Widenius2011-05-032-4/+2
| * | Fix Xtradb compile error on Win64 - conversion between pointers of different ...Vladislav Vaintroub2011-05-031-1/+1
| * | Fix compile errors:Vladislav Vaintroub2011-05-021-1/+2
| |/
* | Merge with MariaDB 5.1Michael Widenius2011-05-03141-1447/+3401
|\ \ | |/
| * Merge with xtradb fixesMichael Widenius2011-05-0258-875/+1233
| |\
| | * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-2958-875/+1233
| * | Merge with MySQL 5.1.57/58Michael Widenius2011-05-0283-572/+2168
| |\ \ | | |/ | |/|
| | * mergeMattias Jonsson2011-04-206-12/+12
| | |\
| | | * Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-256-12/+12
| | * | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-04-0414-129/+234
| | |\ \
| | | * | Bug#11877216 InnoDB too eager to commit suicide on a busy serverMarko Mäkelä2011-03-307-28/+93
| | | * | Store the '\0'-terminated query in row->trx_queryVasil Dimov2011-03-281-1/+1
| | | * | Bug#11849231 inflateInit() invoked without initializing all memoryMarko Mäkelä2011-03-153-45/+53
| | | * | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-03-0210-27/+172
| | | |\ \ | | | | |/
| | | * | Bug #58549 Race condition in buf_LRU_drop_page_hash_for_tablespace()Marko Mäkelä2011-02-285-52/+81
| | | * | Fix BUG#11798085 - INCORRECT INTEGER TYPES USED IN CALCULATION RESULTVasil Dimov2011-02-251-3/+6
| | * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-286-1/+93
| | | |/ | | |/|
| | * | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-02-1716-7/+934
| | |\ \ | | | |/
| | | * Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recursio...Marko Mäkelä2011-02-153-1/+9
| | | * Fix Bug #59749 Enabling concurrent reads while creating non-primary uniqueJimmy Yang2011-02-142-4/+14
| | | * Fix Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recu...Vasil Dimov2011-02-101-0/+1
| | | * Increment InnoDB Plugin version from 1.0.15 to 1.0.16.Vasil Dimov2011-02-101-1/+1
| | | * Implement UNIV_BLOB_DEBUG. An early version of this caught Bug #55284.Marko Mäkelä2011-02-0813-2/+910
| | * | Fix for bug#11766714 (former bug @59888) "debug assertion whenDmitry Lenev2011-02-151-7/+9
| | * | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-02-0814-175/+269
| | |\ \ | | | |/
| | | * Bug #55284 diagnostics: Introduce UNIV_BLOB_LIGHT_DEBUG, enabled by UNIV_DEBUGMarko Mäkelä2011-02-025-54/+144
| | | * Non-functional changes (cleanup) made while narrowing down Bug #55284:Marko Mäkelä2011-02-022-58/+19
| | | * Bug #55284 diagnostics: When UNIV_DEBUG, do not tolerate garbage inMarko Mäkelä2011-02-021-0/+2
| | | * Bug #55284 diagnostics: Enable UNIV_DEBUG_FILE_ACCESSES by UNIV_DEBUGMarko Mäkelä2011-02-025-29/+30
| | | * Bug#59230 assert 0 row_upd_changes_ord_field_binary() in post-crashMarko Mäkelä2011-01-317-34/+74
| | * | Merge from mysql-5.1.55-releaseunknown2011-02-089-20/+163
| | |\ \ | | | |/ | | |/|
| | * | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-01-3050-237/+707
| | |\ \
| | | * | Fix Bug #59465 btr_estimate_number_of_different_key_vals use incorrect offsetJimmy Yang2011-01-283-10/+17
| | | * | Bug#59440 Race condition in XA ROLLBACK and XA COMMIT after server restartMarko Mäkelä2011-01-275-32/+34
| | | * | Bug#59585 Fix 58912 introduces compiler warningMarko Mäkelä2011-01-252-0/+10
| | | * | Bug#59486 Incorrect usage of UNIV_UNLIKELY() in mlog_parse_string()Marko Mäkelä2011-01-252-1/+6
| | | * | Bug#59464 Race condition in row_vers_build_for_semi_consistent_readMarko Mäkelä2011-01-253-6/+19
| | | * | Bug#59707 Unused compression-related parameters in buffer pool functionsMarko Mäkelä2011-01-2512-70/+40
| | | * | Bug#59579 rw_lock_debug_print outputs to stderrMarko Mäkelä2011-01-187-24/+34
| | | * | Non-functional changes.Marko Mäkelä2011-01-174-16/+2
| | | * | Fix Bug#30423 "InnoDBs treatment of NULL in index stats causes bad Jimmy Yang2011-01-1421-77/+545
| | | * | Bug#59181 InnoDB compilation failure on the Sun Studio compilerMarko Mäkelä2011-01-101-1/+1
| | |/ /
* | | | Merge Mariadb 5.1->5.2unknown2011-04-121-0/+1
|\ \ \ \ | |/ / /
| * | | fixed the preload.test pbxt bugVladimir Kolesnikov2011-04-071-0/+1
* | | | Detect Boost installation and build OQGRAPH when possible. For now, disable o...Vladislav Vaintroub2011-04-101-2/+10
* | | | merge 5.2Vladislav Vaintroub2011-03-10265-4801/+5546
|\ \ \ \