summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2010-10-011-5/+8
|\
| * Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-5/+8
* | merge with 5.1Sergei Golubchik2010-09-161-1/+1
|\ \
| * | Fix valgrind failure with Unique classSergey Petrunya2010-09-141-1/+1
* | | rename maria to ariaSergei Golubchik2010-09-121-1/+1
* | | merge with 5.1Sergei Golubchik2010-09-111-15/+49
|\ \ \ | |/ / | | / | |/ |/|
| * 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 MariaDB 5.1.49Michael Widenius2010-08-051-2/+17
|\ \ \ | |/ /
| * | 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
* | | | Fixed bug #604503.Igor Babaev2010-07-171-0/+21
* | | | --plugin_maturity command-line optionSergei Golubchik2010-06-161-1/+0
* | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s...Sergei Golubchik2010-06-051-0/+146
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+7
|\ \ \ \ | |/ / /
| * | | 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
* | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-3/+5
* | | | Merge with 5.1Michael Widenius2010-04-011-0/+2
|\ \ \ \ | |/ / /
| * | | Removed compiler warningMichael Widenius2010-03-301-0/+2
* | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+2
* | | | mergedSergei Golubchik2010-03-151-1/+4
|\ \ \ \ | |/ / /
| * | | 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 5.1-> 5.2unknown2009-12-081-4/+70
|\ \ \ \ | |/ / /
| * | | 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
| | | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-2/+5
| | | * | Bug#47280 - strange results from count(*) with order by multiple Jorgen Loland2009-10-141-1/+26
| | | * | auto-mergeIngo Struewing2009-10-011-0/+5
| | | |\ \
| | | | * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+5
| | | * | | Bug#46958: Assertion in Diagnostics_area::set_ok_status, Martin Hansson2009-09-281-1/+2
| | | |/ /
| | | * | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-101-0/+25