Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 179 | -6388/+33398 |
|\ | |||||
| * | Merge | Igor Babaev | 2010-11-09 | 2 | -1/+10 |
| |\ | |||||
| | * | Fixed LP bug #668644. | Igor Babaev | 2010-11-08 | 2 | -1/+10 |
| * | | Fixed LP BUG#615378 Incorrect processing of NULL result in Item_cache fixed. | unknown | 2010-11-09 | 1 | -30/+74 |
| |/ | |||||
| * | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 13 | -75/+186 |
| |\ | |||||
| | * | Automatic merge with MariaDB 5.1 | Michael Widenius | 2010-11-04 | 4 | -1/+16 |
| | |\ | |||||
| | | * | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge thread | unknown | 2010-11-03 | 4 | -1/+16 |
| | * | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 10 | -74/+170 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 1 | -1/+0 |
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 10 | -73/+170 |
| * | | | Fixed usage of wrong variable in case of errors | Michael Widenius | 2010-11-05 | 1 | -2/+2 |
| * | | | merge | Sergei Golubchik | 2010-11-02 | 6 | -56/+58 |
| |\ \ \ | |||||
| | * | | | fix windows embedded | Sergei Golubchik | 2010-11-02 | 1 | -4/+2 |
| | * | | | merge w/ 5.2 | Sergei Golubchik | 2010-11-02 | 5 | -52/+56 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | fix LIKE in a vcol function, broken by a fix for mysql bug#54568. | Sergei Golubchik | 2010-10-30 | 1 | -0/+5 |
| | | * | | merge w/ 5.1 | Sergei Golubchik | 2010-10-29 | 1 | -0/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Show the number of warm keycache blocks in SHOW STATUS | Sergei Golubchik | 2010-10-20 | 1 | -0/+1 |
| | | * | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 4 | -52/+50 |
| * | | | | Fixed wrong queue_replace(), which caused timeout failure in pbxt.flush_read_... | Michael Widenius | 2010-11-02 | 3 | -5/+15 |
| |/ / / | |||||
| * | | | 5.2 merge | Sergei Golubchik | 2010-10-28 | 30 | -279/+518 |
| |\ \ \ | | |/ / | |||||
| | * | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 27 | -238/+461 |
| | |\ \ | | | |/ | |||||
| | | * | better fix for MySQL bugs | Sergei Golubchik | 2010-10-20 | 4 | -49/+34 |
| | | * | fixed a bad merge | Sergei Golubchik | 2010-10-19 | 1 | -8/+0 |
| | | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 25 | -194/+430 |
| | | |\ | |||||
| | * | | | forgotten option handled | Sergei Golubchik | 2010-10-25 | 1 | -2/+4 |
| | * | | | bugfix: engine defined table options were not showing up in INFORMATION_SCHEM... | Sergei Golubchik | 2010-10-24 | 3 | -25/+41 |
| * | | | | Fixed LP bug #613009 | unknown | 2010-10-27 | 1 | -0/+4 |
| * | | | | Fixed LP bug #609121 | unknown | 2010-10-27 | 2 | -5/+7 |
| * | | | | Type of the variables fixed. | unknown | 2010-10-27 | 2 | -2/+2 |
| * | | | | Fixed LP bug #601156 | unknown | 2010-10-26 | 1 | -1/+1 |
| * | | | | Fixed LP bug #609121 | unknown | 2010-10-25 | 1 | -1/+2 |
| * | | | | # No BUG#, a case brought from 5.2's innodb_mysql_lock.test | Sergey Petrunya | 2010-10-18 | 2 | -2/+1 |
| * | | | | MariaDB 5.2 -> 5.2 post-merge fixes: | Sergey Petrunya | 2010-10-17 | 2 | -5/+10 |
| * | | | | Merge from mariadb-5.1 (through mariadb-5.2) | Igor Babaev | 2010-10-14 | 3 | -73/+74 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge | Igor Babaev | 2010-10-14 | 3 | -73/+74 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Reverted the MySQL fix for bug 51242 that was rejected once for mariadb-5.1.48 | Igor Babaev | 2010-10-14 | 1 | -23/+0 |
| | | * | | Fixes for bugs found by running test case for LP#608369 "Page: 1 Found wrong ... | Michael Widenius | 2010-10-13 | 1 | -4/+5 |
| | | * | | Use less memory on stack in sql_parse.cc and in repair/check for MyISAM & Aria | Michael Widenius | 2010-10-12 | 1 | -46/+69 |
| * | | | | Merge MariaDB 5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-10-14 | 2 | -22/+12 |
| * | | | | Remove garbage comments | Sergey Petrunya | 2010-10-10 | 2 | -11/+0 |
| * | | | | Post-merge fixes part 1 | Sergey Petrunya | 2010-10-10 | 6 | -28/+11 |
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 112 | -2524/+4220 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 4 | -12/+24 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | merge | Sergei Golubchik | 2010-09-28 | 1 | -2/+1 |
| | | |\ \ | |||||
| | | * | | | Fixed bug #57024. | Igor Babaev | 2010-09-26 | 2 | -11/+21 |
| | | * | | | Merge | Igor Babaev | 2010-09-23 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Fixed bug #53161. | Igor Babaev | 2010-09-20 | 1 | -0/+1 |
| | | * | | | | Merge | Igor Babaev | 2010-09-20 | 1 | -1/+2 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Fixed bug #56862 (lp bug #640419). | Igor Babaev | 2010-09-19 | 1 | -1/+2 |
| | * | | | | | Automatic merge | Michael Widenius | 2010-10-01 | 35 | -150/+167 |
| | |\ \ \ \ \ |