summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.3 mainMichael Widenius2011-05-161-0/+29
|\
| * MWL#89unknown2011-04-011-0/+29
| |\
| | * MWL#89unknown2011-03-301-0/+29
| | |\
| | | * MWL#89unknown2011-03-011-0/+29
| | | |\
| | | | * Fix of problem with WHERE/HAVING consist of alone outer reference field by wr...unknown2011-01-241-0/+29
* | | | | Merge with dynamic column codeMichael Widenius2011-05-121-0/+34
|\ \ \ \ \
| * | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-0/+34
| |/ / / /
* | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-2/+1
| |\ \ \ \
| | * \ \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-2/+1
| | |\ \ \ \
| | | * | | | Bug# 11763784 (former 56541)Jon Olav Hauglid2011-03-291-2/+1
* | | | | | | Automatic mergeMichael Widenius2011-03-311-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linkingMichael Widenius2011-03-311-6/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | merge LP BUG#68606Vladislav Vaintroub2011-03-301-38/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Fixed problem that fill_record() allocated memory for every call. This could ...Michael Widenius2011-03-301-38/+20
* | | | | | Merge with 5.2Michael Widenius2011-03-091-26/+29
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+18
| | |\ \ \ | | | |/ /
| | | * | Updating header copyright/README in source for 2011Karen Langford2011-01-251-1/+1
| | | * | mergeGeorgi Kodinov2011-01-121-0/+5
| | | |\ \
| | | | * | Fix for bug#58553, "Queries with pushed conditions causes 'explain extended' Jan Wedvik2011-01-111-0/+5
| | | * | | automergeGeorgi Kodinov2011-01-071-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | MergeKent Boortz2010-12-291-1/+1
| | | | |\ \
| | | | | * | - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| | | * | | | Auto-merge from mysql-5.0-security.Alexander Nozdrin2010-12-151-0/+12
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Patch for Bug#57952 (privilege change is not taken into account by EXECUTE).Alexander Nozdrin2010-12-151-0/+12
| | | | |/ /
| * | | | | Merge with alias as StringMichael Widenius2011-02-281-30/+34
| |\ \ \ \ \
| | * | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-30/+34
| * | | | | | Fix of LP bug#706884: fill_record should be used for only one table (no need ...unknown2011-01-241-24/+8
* | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge with 5.1Michael Widenius2010-11-301-2/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-2/+0
| | |\ \ \ | | | |/ /
| | | * | Bug#56226 Table map set to 0 after altering MyISAM tableunknown2010-10-111-2/+0
* | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data.Michael Widenius2010-11-271-3/+9
* | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-30/+33
* | | | | Automerge with 5.2Michael Widenius2010-11-051-35/+57
|\ \ \ \ \ | |/ / / /
| * | | | Automatic merge with 5.1Michael Widenius2010-11-041-35/+57
| |\ \ \ \ | | |/ / /
| | * | | Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-1/+0
| | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-34/+57
* | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-64/+132
|\ \ \ \ \ | |/ / / /
| * | | | Automatic mergeMichael Widenius2010-10-011-2/+4
| |\ \ \ \
| | * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-2/+4
| * | | | | merge with 5.1Sergei Golubchik2010-09-111-11/+11
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-4/+4
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-7/+7
| | |\ \ \ | | | |/ /
| | | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-10/+4
| | | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-3/+3
| * | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-47/+111
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-47/+111
| | |\ \ \ | | | |/ /