Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -0/+29 |
|\ | |||||
| * | MWL#89 | unknown | 2011-04-01 | 1 | -0/+29 |
| |\ | |||||
| | * | MWL#89 | unknown | 2011-03-30 | 1 | -0/+29 |
| | |\ | |||||
| | | * | MWL#89 | unknown | 2011-03-01 | 1 | -0/+29 |
| | | |\ | |||||
| | | | * | Fix of problem with WHERE/HAVING consist of alone outer reference field by wr... | unknown | 2011-01-24 | 1 | -0/+29 |
* | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+34 |
| |/ / / / | |||||
* | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug# 11763784 (former 56541) | Jon Olav Hauglid | 2011-03-29 | 1 | -2/+1 |
* | | | | | | | Automatic merge | Michael Widenius | 2011-03-31 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linking | Michael Widenius | 2011-03-31 | 1 | -6/+6 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | merge LP BUG#68606 | Vladislav Vaintroub | 2011-03-30 | 1 | -38/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | Fixed problem that fill_record() allocated memory for every call. This could ... | Michael Widenius | 2011-03-30 | 1 | -38/+20 |
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -26/+29 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+19 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+18 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 1 | -1/+1 |
| | | * | | merge | Georgi Kodinov | 2011-01-12 | 1 | -0/+5 |
| | | |\ \ | |||||
| | | | * | | Fix for bug#58553, "Queries with pushed conditions causes 'explain extended' | Jan Wedvik | 2011-01-11 | 1 | -0/+5 |
| | | * | | | automerge | Georgi Kodinov | 2011-01-07 | 1 | -1/+1 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | | | |\ \ | |||||
| | | | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | | * | | | | Auto-merge from mysql-5.0-security. | Alexander Nozdrin | 2010-12-15 | 1 | -0/+12 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Patch for Bug#57952 (privilege change is not taken into account by EXECUTE). | Alexander Nozdrin | 2010-12-15 | 1 | -0/+12 |
| | | | |/ / | |||||
| * | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -30/+34 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -30/+34 |
| * | | | | | | Fix of LP bug#706884: fill_record should be used for only one table (no need ... | unknown | 2011-01-24 | 1 | -24/+8 |
* | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -2/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -2/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#56226 Table map set to 0 after altering MyISAM table | unknown | 2010-10-11 | 1 | -2/+0 |
* | | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data. | Michael Widenius | 2010-11-27 | 1 | -3/+9 |
* | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -30/+33 |
* | | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -35/+57 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -35/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 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 | 1 | -34/+57 |
* | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -64/+132 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| | * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -2/+4 |
| * | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -11/+11 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -4/+4 |
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -7/+7 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -10/+4 |
| | | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -47/+111 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -47/+111 |
| | |\ \ \ | | | |/ / |