summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-9/+5
|\
| * Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-7/+0
| * Updated/added copyright headersKent Boortz2011-07-031-0/+1
| |\
| | * Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-181-0/+1
| * | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| |\ \ | | |/ | |/|
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+2
* | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
|\ \ \ | |/ /
| * | merge to 5.1.Georgi Kodinov2011-02-021-1/+1
| |\ \ | | |/
| | * Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-021-1/+1
* | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-13/+17
* | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-3/+2
|\ \ \ | |/ /
| * | MergeKent Boortz2010-12-291-1/+1
| |\ \ | | |/
| | * - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| * | Fixed following problems:Sergey Glukhov2010-12-141-2/+0
* | | Automatic merge with 5.1Michael Widenius2010-11-251-1/+19
|\ \ \
| * | | Fix of LP BUG#675248.unknown2010-11-231-1/+19
* | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-5/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bug#27606 GRANT statement should be replicated with DEFINER informationunknown2010-10-231-4/+3
* | | MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-031-0/+7
* | | 5.1.51 mergeSergei Golubchik2010-10-191-2/+6
|\ \ \ | |/ /
| * | WL#5370 Keep forward-compatibility when changingunknown2010-08-181-2/+6
* | | Fix valgrind failure with Unique classSergey Petrunya2010-09-141-1/+1
* | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-14/+49
|\ \ \ | |/ /
| * | Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VARGeorgi Kodinov2010-07-141-7/+10
| * | The following statements support the CURRENT_USER() where a user is needed.unknown2010-07-041-0/+31
| * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-7/+8
* | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+17
|\ \ \ | |/ /
| * | Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-281-16/+0
| * | The following statements support the CURRENT_USER() where a user is needed.unknown2010-06-271-0/+16
| * | Bug#41660: Sort-index_merge for non-first join table mayMartin Hansson2010-06-241-0/+3
| * | mergeGeorgi Kodinov2010-06-041-0/+5
| |\ \ | | |/
| | * Bug #52315: utc_date() crashes when system time > year 2037Georgi Kodinov2010-06-041-0/+5
| * | Bug #49756 Rows_examined is always 0 in the slow query log forStaale Smedseng2010-05-121-2/+9
* | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-1/+5
|\ \ \ | |/ /
| * | BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-141-1/+5
* | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+2
|\ \ \ | |/ /
| * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-03-291-0/+1
| * | revert 48525Tatiana A. Nurnberg2010-02-221-1/+0
| * | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-02-181-0/+1
| * | Bug#49534: multitable IGNORE update with sql_safe_updatesMartin Hansson2010-02-101-1/+1
* | | Removed compiler warningMichael Widenius2010-03-301-0/+2
* | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+4
|\ \ \ | |/ /
| * | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-1/+1
| * | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-0/+1
| * | Auto-merged.Evgeny Potemkin2009-12-021-0/+2
| |\ \ | | |/
| | * Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-0/+2
* | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-4/+69
|\ \ \
| * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-4/+69
| |\ \ \ | | |/ /
| | * | manual merge of 28141Tatiana A. Nurnberg2009-10-201-0/+6
| | |\ \ | | | |/
| | | * Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-0/+6