summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with MariaDB 5.1Michael Widenius2011-11-241-55/+151
|\
| * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-52/+152
| |\
| | * Merge.Sergey Vojtovich2011-08-241-42/+141
| | |\
| | | * BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-42/+141
| | * | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-4/+4
| | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-2/+2
| | |/
* | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-2/+2
* | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ...Michael Widenius2011-09-021-2/+3
* | | 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
* | | Fixed problem that fill_record() allocated memory for every call. This could ...Michael Widenius2011-03-301-38/+20
* | | 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
* | | | | 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
* | | | 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
* | | | 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
| |\ \ \ | | |/ /
| | * | A 5.1-only version of fix for bug #46947 "Embedded SELECTDmitry Lenev2010-05-281-9/+25
| | * | BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in...Alfranio Correia2010-05-161-36/+58
| | * | mergeMattias Jonsson2010-05-101-11/+28
| | |\ \
| | | * | Additional fix for DEBUG_SYNC which failed for some rpl-tests,Mattias Jonsson2010-03-181-1/+6
| | | * | Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks withMattias Jonsson2010-03-171-11/+23
| | * | | BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in...Alfranio Correia2010-05-091-0/+10
| | |/ /
* | | | MergeIgor Babaev2010-07-171-4/+4
|\ \ \ \
| * | | | Fixed bug #604503.Igor Babaev2010-07-171-4/+4
* | | | | Fixed bug #603186.Igor Babaev2010-07-151-0/+2
|/ / / /
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+17
|\ \ \ \ | |/ / /