summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Unset the execute bit where it's not needed.Davi Arnaut2010-07-0339-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-021-4/+4
|\
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-86/+4
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-0260-365/+260
|\ \ | |/
| * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0267-362/+257
| * mergeGeorgi Kodinov2010-07-020-0/+0
| |\
| | * mergeGeorgi Kodinov2010-07-020-0/+0
| | |\
| * | \ mergeGeorgi Kodinov2010-07-021-1/+1
| |\ \ \
| | * | | Raise version number after cloning 5.1.48karen.langford@oracle.com2010-06-031-1/+1
| | * | | mergeGeorgi Kodinov2010-06-021-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | changed the tree nameGeorgi Kodinov2010-06-021-1/+1
* | | | | Automerge.Alexey Kopytov2010-07-010-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Automerge.Alexey Kopytov2010-07-015-11/+11
| |\ \ \ \
* | \ \ \ \ Automerge.Alexey Kopytov2010-07-015-11/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge from 5.1.Alexey Kopytov2010-07-015-11/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-015-11/+11
* | | | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-303-1/+72
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Bug#51431 Wrong sort order after import of dump fileSergey Glukhov2010-06-303-1/+72
* | | | | | | AutomergeStaale Smedseng2010-06-301-4/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Bug #53899 Wrong mysql_stmt_errno() after connection loss withStaale Smedseng2010-06-301-4/+24
| * | | | | | Fix of bad merge of test case for Bug#41660 (test case moved).Martin Hansson2010-06-291-14/+14
* | | | | | | BUG 53657: empty merge from mysql-5.1-bugteam.Luis Soares2010-06-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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-2812-605/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-2812-602/+21
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-283-2/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-282-0/+87
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-06-282-0/+86
| * | | | | | | Bug#54457: Test suite broken for 32-bit buildDavi Arnaut2010-06-282-3/+1
* | | | | | | | null-mergeAlfranio Correia2010-06-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-06-278-42/+191
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-06-178-42/+191
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#53560 CREATE TEMP./DROP TEMP. are not binglogged correctly after a failed...Alfranio Correia2010-05-198-41/+190
* | | | | | | | | | Manual merge2010-06-2712-21/+606
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | The following statements support the CURRENT_USER() where a user is needed.2010-06-2712-21/+602
* | | | | | | | | | null-merge from mysql-5.1-bugteam.Jon Olav Hauglid2010-06-260-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLERJon Olav Hauglid2010-06-263-0/+102
* | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-06-262-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated the version numbersunanda2010-06-231-1/+1
| * | | | | | | | | | Made the changes as per Kent/wlad to include http://lists.mysql.com/commits/1...sunanda2010-06-231-1/+1
* | | | | | | | | | | mergeGeorgi Kodinov2010-06-253-1/+44
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | mergeGeorgi Kodinov2010-06-253-1/+44
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #52711: Segfault when doing EXPLAIN SELECT withGeorgi Kodinov2010-04-153-1/+44
* | | | | | | | | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-06-253-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Bug#54422 query with = 'variables'Sergey Glukhov2010-06-253-1/+22
* | | | | | | | | | | | Automerge.Ramil Kalimullin2010-06-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Accidentally pushed test changes (#54459) removed.Ramil Kalimullin2010-06-241-4/+0
* | | | | | | | | | | | Merge of fix for Bug#41660.Martin Hansson2010-06-245-20/+89
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /