summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-2/+8
|\
| * Added two new flags for the optimizer switch:Igor Babaev2011-06-051-2/+8
* | Fixed that mysqld --no-defaults --help --verbose doesn't give a lot of irrele...Michael Widenius2011-06-071-8/+7
|/
* Change optimizer_use_mrr=auto|disable|forceSergey Petrunya2011-06-031-2/+6
* automatic merge with 5.2Michael Widenius2011-05-281-1/+32
|\
| * Fixed sql_perror() to return appropriate error messages on Windows,Vladislav Vaintroub2011-05-261-1/+1
| * On Windows, collect mysql error log with Windows Error Reporting.Vladislav Vaintroub2011-05-261-0/+31
* | Merge with 5.1-microsecondsMichael Widenius2011-05-281-7/+24
|\ \
| * | many changes to my_getsystime.c:Sergei Golubchik2011-05-191-3/+3
| * | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-2/+3
* | | Rewritten patch of percona - switching query cache on and off, removing comme...unknown2011-05-181-1/+10
* | | Merge with 5.3 mainMichael Widenius2011-05-161-3/+5
|\ \ \
| * \ \ MWL#89 - Automatic merge with 5.3unknown2011-05-101-3/+5
| |\ \ \
| | * \ \ MWL#89unknown2011-05-021-3/+5
| | |\ \ \
| | | * \ \ MWL#89unknown2011-04-011-3/+5
| | | |\ \ \
| | | | * \ \ MWL#89unknown2011-03-301-3/+5
| | | | |\ \ \
| | | | | * \ \ MWL#89unknown2011-03-301-3/+5
| | | | | |\ \ \
| | | | | | * \ \ MWL#89unknown2011-03-011-1/+2
| | | | | | |\ \ \
| | | | | | * \ \ \ MWL#89unknown2011-03-011-3/+5
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge MWL#89 into 5.3 main.unknown2011-01-111-3/+5
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merge 5.3-mwl89 into 5.3.unknown2010-12-031-3/+5
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-3/+5
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-10-091-2/+2
| | | | | | | | | | * | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-09-301-3/+5
* | | | | | | | | | | | | | Merge with dynamic column codeMichael Widenius2011-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed compiler warnings and test cases problems found by buildbotMichael Widenius2011-05-111-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-20/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix effect of recent mismerge (it made default pid file name ".pid" instea...Vladislav Vaintroub2011-05-071-8/+9
| * | | | | | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-13/+67
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-8/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET Georgi Kodinov2011-03-251-0/+8
| | | * | | | | | | | | | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-151-1/+27
| | | * | | | | | | | | | | | Fixed bug#58026 - massive recursion and crash in regular expressionDmitry Shulga2011-02-041-1/+18
| | | * | | | | | | | | | | | merge to 5.1.Georgi Kodinov2011-02-021-6/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Fixes for Bug #55755 and Bug #52315 part 2Georgi Kodinov2011-02-021-7/+7
| | * | | | | | | | | | | | | | Added calls to cleanup_mutexes() for embedded library.Michael Widenius2011-04-281-2/+4
* | | | | | | | | | | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-031-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-1/+19
* | | | | | | | | | | | | | | | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-081-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-011-43/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge three Percona patches into mariadb-5.2-rpl:unknown2011-01-261-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-0/+15
| * | | | | | | | | | | | | | | | Merge MWL#116 into mariadb-5.2-rpl.unknown2010-12-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge latest MariaDB 5.1 into MWL#116.unknown2010-11-011-14/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with latest MariaDB 5.1unknown2010-10-011-623/+874
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | MWL#116: Efficient group commit for binary logunknown2010-09-301-0/+3
* | | | | | | | | | | | | | | | | | | Fixes to get more information about random bind failure in pushbuild for wind...Michael Widenius2011-03-301-2/+4
| |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2011-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed test failures with embedded serverMichael Widenius2011-03-281-1/+1
* | | | | | | | | | | | | | | | | mergeVladislav Vaintroub2011-03-261-53/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /