Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 57 | -1683/+6135 |
|\ | |||||
| * | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 3 | -61/+152 |
| |\ | |||||
| | * | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 3 | -61/+152 |
| | |\ | |||||
| | | * | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 1 | -0/+1 |
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 3 | -61/+151 |
| * | | | merge | Sergei Golubchik | 2010-11-02 | 1 | -159/+2 |
| |\ \ \ | |||||
| | * \ \ | merge w/ 5.2 | Sergei Golubchik | 2010-11-02 | 1 | -159/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merge w/ 5.1 | Sergei Golubchik | 2010-10-29 | 1 | -0/+2 |
| | | |\ \ | | | | |/ | |||||
| | | * | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 1 | -159/+0 |
| * | | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_... | Michael Widenius | 2010-11-02 | 2 | -0/+26 |
| |/ / / | |||||
| * | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -12/+15 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -12/+15 |
| | |\ \ | | | |/ | |||||
| | | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -12/+15 |
| | | |\ | |||||
| * | | \ | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 24 | -153/+282 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 1 | -81/+98 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i... | Michael Widenius | 2010-10-06 | 1 | -81/+98 |
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-16 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | mysqltest now gives error messages with error code for my_delete, my_rename, ... | Michael Widenius | 2010-09-15 | 1 | -1/+1 |
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 12 | -39/+87 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 12 | -39/+87 |
| | | |\ \ | |||||
| | * | \ \ | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -5/+5 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | missing DBUG_RETURNs | Sergei Golubchik | 2010-08-14 | 1 | -5/+5 |
| | * | | | | Merge with 5.1 | Michael Widenius | 2010-08-11 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed typo that caused compile failure on Mac | Michael Widenius | 2010-08-10 | 1 | -1/+1 |
| | * | | | | Merge with 5.1 to get in critical bug fix that caused Aria tests to fail | Michael Widenius | 2010-08-10 | 1 | -0/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Ignore ENOLCK errno from FreeBSD (known problem in old FreeBSD releases) | Michael Widenius | 2010-08-09 | 1 | -0/+2 |
| | * | | | | Merge with 5.2 | Michael Widenius | 2010-08-09 | 2 | -0/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Added --sync-sys=0 option for mysqld to skip sync() calls for faster testing | Michael Widenius | 2010-08-09 | 2 | -0/+4 |
| | * | | | | Added extra argument to longlong2str() to make it have same prototype is int2... | Michael Widenius | 2010-08-07 | 3 | -4/+4 |
| | * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 8 | -29/+84 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ... | Michael Widenius | 2010-08-04 | 1 | -0/+18 |
| | | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 6 | -28/+65 |
| | | |\ \ \ | |||||
| | | * | | | | Fix for LP#602604: RQG: ma_blockrec.c:6187: _ma_apply_redo_insert_row_head_or... | Michael Widenius | 2010-07-30 | 1 | -1/+1 |
| | * | | | | | buildbot detected problems | Sergei Golubchik | 2010-07-24 | 1 | -1/+1 |
| | * | | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+2 |
| * | | | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 2 | -588/+223 |
| |/ / / / / | |||||
| * | | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 9 | -14/+39 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Added macros to inform valgrind that memory is uninitialized | Michael Widenius | 2010-05-26 | 1 | -2/+1 |
| | * | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 4 | -8/+22 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 4 | -4/+16 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | first initialize variable, then use it, not the other way around | Sergei Golubchik | 2010-05-27 | 1 | -1/+1 |
| * | | | | | | | fix a warning | Sergei Golubchik | 2010-04-06 | 1 | -1/+1 |
| * | | | | | | | Post review fixes. | Igor Babaev | 2010-04-05 | 1 | -18/+55 |
| * | | | | | | | Merge with the latest changes of 5.2 | Igor Babaev | 2010-04-03 | 2 | -3/+12 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Auto merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Added missing space from last push | Michael Widenius | 2010-03-31 | 1 | -1/+1 |
| | * | | | | | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 2 | -3/+12 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 2 | -3/+12 |
| * | | | | | | | | Post-review fixes. | Igor Babaev | 2010-04-01 | 1 | -486/+460 |