summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Unset the execute bit where it's not needed.Davi Arnaut2010-07-033-0/+0
* Post-merge fix: restore promotion to unsigned long long side-effect of bit_is...Davi Arnaut2010-07-031-4/+6
* Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-0214-53/+49
|\
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0216-91/+82
| * Automerge.Alexey Kopytov2010-07-011-1/+1
| |\
* | \ Automerge.Alexey Kopytov2010-07-011-1/+1
|\ \ \
| * \ \ Manual merge from 5.1.Alexey Kopytov2010-07-011-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-1/+1
* | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-301-1/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#51431 Wrong sort order after import of dump fileSergey Glukhov2010-06-301-1/+10
| * | | BUG 53657: automerge bzr bundle from bug report into mysql-5.1-bugteam.Luis Soares2010-06-286-12/+30
| |\ \ \
| | * | | BUG#53657: Slave crashed with error 22 when trying to lock mutexLuis Soares2010-05-246-12/+30
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-286-109/+9
|\ \ \ \ \ | |/ / / /
| * | | | Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-286-107/+9
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-281-0/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-281-0/+29
| |\ \ \ \
| | * | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-06-281-0/+28
| * | | | | Bug#54457: Test suite broken for 32-bit buildDavi Arnaut2010-06-281-1/+1
| * | | | | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-06-275-42/+91
| |\ \ \ \ \
| | * \ \ \ \ merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-06-175-42/+91
| | |\ \ \ \ \
| | | * | | | | BUG#53560 CREATE TEMP./DROP TEMP. are not binglogged correctly after a failed...Alfranio Correia2010-05-195-41/+90
* | | | | | | | Manual merge2010-06-276-9/+110
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | The following statements support the CURRENT_USER() where a user is needed.2010-06-276-9/+107
| * | | | | | | Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLERJon Olav Hauglid2010-06-261-0/+36
* | | | | | | | mergeGeorgi Kodinov2010-06-251-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | mergeGeorgi Kodinov2010-06-251-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #52711: Segfault when doing EXPLAIN SELECT withGeorgi Kodinov2010-04-151-1/+2
* | | | | | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-251-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Bug#54422 query with = 'variables'Sergey Glukhov2010-06-251-1/+3
* | | | | | | | | Merge of fix for Bug#41660.Martin Hansson2010-06-243-19/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Bug#41660: Sort-index_merge for non-first join table mayMartin Hansson2010-06-243-19/+24
* | | | | | | | | Automerge.Ramil Kalimullin2010-06-241-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Automerge.Ramil Kalimullin2010-06-241-3/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for bug #54575: crash when joining tables with unique set columnRamil Kalimullin2010-06-201-3/+4
| * | | | | | | | | Automerge.Alexey Kopytov2010-06-241-0/+10
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2010-06-241-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2010-06-241-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Bug#54477: Crash on IN / CASE with NULL argumentsAlexey Kopytov2010-06-221-0/+10
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | Automerge.Ramil Kalimullin2010-06-241-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix for bug #54459: Assertion failed: param.sort_length, Ramil Kalimullin2010-06-241-5/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge mysql-trunk -> mysql-trunk-mergeVasil Dimov2010-06-2260-1703/+2682
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Auto-merge from mysql-trunk-stage.Alexander Nozdrin2010-06-212-6/+6
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ mergeDaniel Fischer2010-06-182-6/+6
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ MergeDaniel Fischer2010-04-21114-7988/+13453
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix Windows data directory, from wlad.Jonathan Perkin2010-04-201-1/+2
| | | * | | | | | | | | Fix a couple fo things replated to MSIVladislav Vaintroub2010-02-161-2/+2
| | | * | | | | | | | | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-102-4/+4
| * | | | | | | | | | | WL#5349 Change default storage engine to InnoDBMagne Mahre2010-06-171-0/+8
| * | | | | | | | | | | Merge.Konstantin Osipov2010-06-171-5/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Small clean-up and pre-requisite for makingDmitry Lenev2010-06-161-5/+0