Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -34/+133 |
|\ | |||||
| * | Fixed LP bug #794890. | Igor Babaev | 2011-06-13 | 1 | -5/+8 |
| * | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -16/+42 |
| |\ | |||||
| | * | Fixed bugs causing failures fot the funcs_1 test suite. | Igor Babaev | 2011-06-03 | 1 | -1/+6 |
| | * | Merge | Igor Babaev | 2011-05-20 | 1 | -15/+36 |
| | |\ | |||||
| | | * | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -15/+36 |
| | | |\ | |||||
| | | | * | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -15/+36 |
| * | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -2/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -2/+1 |
| * | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -16/+47 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -13/+44 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -13/+44 |
| | | |\ \ \ | |||||
| | * | \ \ \ | Merge Mariadb 5.1->5.2 | unknown | 2011-04-12 | 1 | -3/+3 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug fix for lp:732124 union + limit returns wrong result | Michael Widenius | 2011-03-09 | 1 | -3/+3 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -16/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -16/+4 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -16/+4 |
| | | |\ \ \ \ | |||||
| * | | | | | | | Fix for LP#697622 Assertion `! is_set()' failed when preparing a HANDLER stat... | Michael Widenius | 2011-01-12 | 1 | -5/+2 |
| * | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+61 |
| * | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+4 |
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
* | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -48/+54 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merge from latest 5.5 | Guilhem Bichot | 2011-05-21 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed error in merge | Mikael Ronstrom | 2011-04-20 | 1 | -1/+1 |
| | * | | | | | | | | Merge 5.5 | Mikael Ronström | 2011-04-15 | 1 | -12/+24 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Changed prefix from ES_ to STMT_ on Query arena state | Mikael Ronstrom | 2011-03-04 | 1 | -9/+9 |
| | * | | | | | | | | | BUG#59549, fix compiler error on Windows, step 2 | Mikael Ronstrom | 2011-01-20 | 1 | -9/+9 |
| * | | | | | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -8/+8 |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty | Alexander Nozdrin | 2011-04-15 | 1 | -3/+4 |
| * | | | | | | | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial | Dmitry Shulga | 2011-03-15 | 1 | -10/+21 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -13/+43 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | | * | | | | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run | Davi Arnaut | 2010-07-30 | 1 | -2/+2 |
| * | | | | | | | | Bug #58350: 5.5.7-rc compile failed at sp_head.cc | Georgi Kodinov | 2010-12-08 | 1 | -1/+1 |
| * | | | | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-14 | 1 | -15/+3 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -15/+3 |
| | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteam | Jon Olav Hauglid | 2010-11-18 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-11-16 | 1 | -2/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -2/+1 |
| * | | | | | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well. | Alexander Barkov | 2010-11-18 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Bug#54812: assert in Diagnostics_area::set_ok_status | Jorgen Loland | 2010-11-15 | 1 | -1/+8 |
| * | | | | | | | | Fix for Bug#56934 (mysql_stmt_fetch() incorrectly fills MYSQL_TIME | Alexander Nozdrin | 2010-11-13 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | merge | Georgi Kodinov | 2010-09-29 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
* | | | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+2 |
* | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -10/+14 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -17/+56 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | | |