summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2011-05-193-6/+16
|\
| * Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEXMichael Widenius2011-05-183-6/+16
* | Fix compile warning.Vladislav Vaintroub2011-05-181-1/+1
|/
* Removed some alias warningsMichael Widenius2011-05-181-5/+3
* Fix of compiler errors.unknown2011-05-163-1/+5
* Merge with 5.2Michael Widenius2011-05-1627-161/+364
|\
| * Small CMake fixes :Vladislav Vaintroub2011-05-151-0/+1
| * mergeVladislav Vaintroub2011-05-146-1/+13
| |\
| | * Fix bugs found by application verifier : Vladislav Vaintroub2011-05-141-0/+1
| | * Fix PBXT bugs found while testing with Application Verifier : Vladislav Vaintroub2011-05-144-0/+12
| | * LPBUG#782269 : Fixed double initialization of condition variables in PBXT.Vladislav Vaintroub2011-05-131-1/+0
| * | Made test-unit run in parlallel. This was achived by having all aria tests th...Michael Widenius2011-05-1318-124/+310
| |/
| * small enhancement of the create table options feature:Sergei Golubchik2011-05-101-33/+36
| * Fix Windows embedded warningsVladislav Vaintroub2011-05-101-3/+4
* | Added more asserts to find out how maria.maria-big could have failed in build...Michael Widenius2011-05-163-4/+13
* | Merge with MariaDB 5.2Michael Widenius2011-05-10145-1450/+3410
|\ \ | |/
| * Automatic merge with 5.1Michael Widenius2011-05-083-0/+6
| |\
| | * Improved 'make test-unit' time slightlyMichael Widenius2011-05-053-0/+6
| * | 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