Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Fixed lock sorting and lock check issues with thr_lock that caused warnings w... | Michael Widenius | 2011-06-06 | 1 | -42/+70 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -2/+6 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -2/+6 | |
| * | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -6/+4 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Fixed typo that caused compile failure in thr_lock.c | Michael Widenius | 2010-12-13 | 1 | -1/+1 | |
| | * | | | | Better warning message if lock test fails | Michael Widenius | 2010-12-10 | 1 | -6/+4 | |
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -3/+8 | |
| |/ / / / | ||||||
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 | |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -13/+0 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -13/+0 | |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -18/+8 | |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -119/+194 | |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | 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 | 1 | -58/+149 | |
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+1 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+22 | |
| |\ \ \ | ||||||
| * \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -3/+6 | |
| |\ \ \ \ | ||||||
| * | | | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test: | Michael Widenius | 2008-12-22 | 1 | -1/+2 | |
| * | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -32/+70 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Added versioning of row data | unknown | 2008-04-10 | 1 | -32/+70 | |
| * | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -13/+7 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -13/+7 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 1 | -13/+7 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 1 | -13/+7 | |
* | | | | | | | | | | | | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-08-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK and | Dmitry Lenev | 2010-08-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merging with mysql-5.5-stage. | Mats Kindahl | 2010-08-16 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | WL#5363: Thread Pool Service Interface | Mats Kindahl | 2010-06-07 | 1 | -0/+31 | |
* | | | | | | | | | | | | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor. | Konstantin Osipov | 2010-07-27 | 1 | -34/+17 | |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | A follow up patch for the fix for Bug#51263 "Deadlock between | Konstantin Osipov | 2010-06-01 | 1 | -200/+18 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-15 | 1 | -1/+0 | |
* | | | | | | | | | | | Bug #45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-11 | 1 | -16/+16 | |
* | | | | | | | | | | | Bug #50821 Deadlock between LOCK TABLES and ALTER TABLE | Jon Olav Hauglid | 2010-02-04 | 1 | -3/+2 | |
* | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -74/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -74/+76 | |
* | | | | | | | | | | | | Fix for bug #48538 "Assertion in thr_lock() on LOAD DATA CONCURRENT | Jon Olav Hauglid | 2010-01-08 | 1 | -9/+20 | |
* | | | | | | | | | | | | Backport of revno: 2617.68.18 | Jon Olav Hauglid | 2009-12-09 | 1 | -7/+25 | |
* | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -0/+7 | |
* | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -0/+2 | |
* | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-02 | 1 | -6/+36 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -9/+9 | |
* | | | | | | | | | | | Fix for bug #45143 "All connections hang on concurrent ALTER TABLE". | Dmitry Lenev | 2009-10-26 | 1 | -9/+32 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+22 | |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
* | | | | | | | | | Bug#40536: SELECT is blocked by INSERT DELAYED waiting on | Davi Arnaut | 2009-02-03 | 1 | -3/+6 | |
| |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | Merge Bug#36579 into mysql-5.1-bugteam | Davi Arnaut | 2008-08-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | |