Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2011-05-19 | 3 | -6/+16 |
|\ | |||||
| * | Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEX | Michael Widenius | 2011-05-18 | 3 | -6/+16 |
* | | Fix compile warning. | Vladislav Vaintroub | 2011-05-18 | 1 | -1/+1 |
|/ | |||||
* | Removed some alias warnings | Michael Widenius | 2011-05-18 | 1 | -5/+3 |
* | Fix of compiler errors. | unknown | 2011-05-16 | 3 | -1/+5 |
* | Merge with 5.2 | Michael Widenius | 2011-05-16 | 27 | -161/+364 |
|\ | |||||
| * | Small CMake fixes : | Vladislav Vaintroub | 2011-05-15 | 1 | -0/+1 |
| * | merge | Vladislav Vaintroub | 2011-05-14 | 6 | -1/+13 |
| |\ | |||||
| | * | Fix bugs found by application verifier : | Vladislav Vaintroub | 2011-05-14 | 1 | -0/+1 |
| | * | Fix PBXT bugs found while testing with Application Verifier : | Vladislav Vaintroub | 2011-05-14 | 4 | -0/+12 |
| | * | LPBUG#782269 : Fixed double initialization of condition variables in PBXT. | Vladislav Vaintroub | 2011-05-13 | 1 | -1/+0 |
| * | | Made test-unit run in parlallel. This was achived by having all aria tests th... | Michael Widenius | 2011-05-13 | 18 | -124/+310 |
| |/ | |||||
| * | small enhancement of the create table options feature: | Sergei Golubchik | 2011-05-10 | 1 | -33/+36 |
| * | Fix Windows embedded warnings | Vladislav Vaintroub | 2011-05-10 | 1 | -3/+4 |
* | | Added more asserts to find out how maria.maria-big could have failed in build... | Michael Widenius | 2011-05-16 | 3 | -4/+13 |
* | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 145 | -1450/+3410 |
|\ \ | |/ | |||||
| * | Automatic merge with 5.1 | Michael Widenius | 2011-05-08 | 3 | -0/+6 |
| |\ | |||||
| | * | Improved 'make test-unit' time slightly | Michael Widenius | 2011-05-05 | 3 | -0/+6 |
| * | | Automatic merge with 5.1 | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed compiler warning | Michael Widenius | 2011-05-04 | 1 | -1/+1 |
| * | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 4 | -6/+5 |
| |\ \ | | |/ | |||||
| | * | Automatic merge | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | |\ | |||||
| | | * | Fixed after-merge failures found by buildbot | Michael Widenius | 2011-05-03 | 2 | -4/+2 |
| | * | | Fix Xtradb compile error on Win64 - conversion between pointers of different ... | Vladislav Vaintroub | 2011-05-03 | 1 | -1/+1 |
| | * | | Fix compile errors: | Vladislav Vaintroub | 2011-05-02 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 141 | -1447/+3401 |
| |\ \ | | |/ | |||||
| | * | Merge with xtradb fixes | Michael Widenius | 2011-05-02 | 58 | -875/+1233 |
| | |\ | |||||
| | | * | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. | unknown | 2011-04-29 | 58 | -875/+1233 |
| | * | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 83 | -572/+2168 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | merge | Mattias Jonsson | 2011-04-20 | 6 | -12/+12 |
| | | |\ | |||||
| | | | * | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK | Mattias Jonsson | 2011-03-25 | 6 | -12/+12 |
| | | * | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-04-04 | 14 | -129/+234 |
| | | |\ \ | |||||
| | | | * | | Bug#11877216 InnoDB too eager to commit suicide on a busy server | Marko Mäkelä | 2011-03-30 | 7 | -28/+93 |
| | | | * | | Store the '\0'-terminated query in row->trx_query | Vasil Dimov | 2011-03-28 | 1 | -1/+1 |
| | | | * | | Bug#11849231 inflateInit() invoked without initializing all memory | Marko Mäkelä | 2011-03-15 | 3 | -45/+53 |
| | | | * | | Merge mysql-5.1 -> mysql-5.1-innodb | Vasil Dimov | 2011-03-02 | 10 | -27/+172 |
| | | | |\ \ | | | | | |/ | |||||
| | | | * | | Bug #58549 Race condition in buf_LRU_drop_page_hash_for_tablespace() | Marko Mäkelä | 2011-02-28 | 5 | -52/+81 |
| | | | * | | Fix BUG#11798085 - INCORRECT INTEGER TYPES USED IN CALCULATION RESULT | Vasil Dimov | 2011-02-25 | 1 | -3/+6 |
| | | * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 6 | -1/+93 |
| | | | |/ | | | |/| | |||||
| | | * | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-02-17 | 16 | -7/+934 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recursio... | Marko Mäkelä | 2011-02-15 | 3 | -1/+9 |
| | | | * | Fix Bug #59749 Enabling concurrent reads while creating non-primary unique | Jimmy Yang | 2011-02-14 | 2 | -4/+14 |
| | | | * | Fix Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recu... | Vasil Dimov | 2011-02-10 | 1 | -0/+1 |
| | | | * | Increment InnoDB Plugin version from 1.0.15 to 1.0.16. | Vasil Dimov | 2011-02-10 | 1 | -1/+1 |
| | | | * | Implement UNIV_BLOB_DEBUG. An early version of this caught Bug #55284. | Marko Mäkelä | 2011-02-08 | 13 | -2/+910 |
| | | * | | Fix for bug#11766714 (former bug @59888) "debug assertion when | Dmitry Lenev | 2011-02-15 | 1 | -7/+9 |
| | | * | | Merge mysql-5.1-innodb -> mysql-5.1 | Vasil Dimov | 2011-02-08 | 14 | -175/+269 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #55284 diagnostics: Introduce UNIV_BLOB_LIGHT_DEBUG, enabled by UNIV_DEBUG | Marko Mäkelä | 2011-02-02 | 5 | -54/+144 |
| | | | * | Non-functional changes (cleanup) made while narrowing down Bug #55284: | Marko Mäkelä | 2011-02-02 | 2 | -58/+19 |
| | | | * | Bug #55284 diagnostics: When UNIV_DEBUG, do not tolerate garbage in | Marko Mäkelä | 2011-02-02 | 1 | -0/+2 |