summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-1273-683/+1634
|\
| * auto-mergeTatiana A. Nurnberg2009-01-311-2/+2
| |\
| | * auto-mergeTatiana A. Nurnberg2009-01-311-2/+2
| | |\
| | | * Bug#41370: TIMESTAMP field does not accepts NULL from FROM_UNIXTIME()Tatiana A. Nurnberg2009-01-301-2/+2
| | * | merged 35396 to 5.0-bugteamGeorgi Kodinov2009-01-291-2/+3
| | |\ \
| | | * | Bug #35396: Abnormal query times in slow query logGeorgi Kodinov2009-01-291-2/+3
| * | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-3012-51/+81
| |\ \ \ \
| | * \ \ \ MergeMagnus Svensson2009-01-271-1/+1
| | |\ \ \ \
| | | * | | | WL#4189 mtr.pl v2Magnus Svensson2009-01-261-1/+1
| | * | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-2349-569/+1406
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-0841-41/+41
| | |\ \ \ \ \
| | * \ \ \ \ \ merge 5.1 --> 5.1-rplAlfranio Correia2008-12-1336-426/+730
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-1247-544/+1364
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merging 5.1 main into 5.1-rplMats Kindahl2008-10-2345-505/+1497
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-0621-117/+11367
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Auto MergeHe Zhenxing2008-09-2929-654/+2433
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-0629-654/+2433
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | BUG#38734 rpl_server_id2 sync_with_master failedHe Zhenxing2008-09-286-30/+50
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Eliminating some compiler warnings.Mats Kindahl2008-08-251-0/+4
| | * | | | | | | | | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-223-8/+8
| | * | | | | | | | | | | Merging with 5.1-rpl.Mats Kindahl2008-08-2027-48/+178
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merging with 5.1-rplMats Kindahl2008-08-1919-38/+98
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge 5.1-rpl-testfixes -> 5.1-rplHe Zhenxing2008-08-1419-38/+98
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug #34707: Row based replication: slave creates table within wrong databaseMats Kindahl2008-08-199-10/+80
| | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary ...Mats Kindahl2008-08-201-8/+15
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | post push fix for BUG#37051He Zhenxing2008-08-071-0/+1
| | * | | | | | | | | | | | Auto mergeHe Zhenxing2008-08-0646-432/+763
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ merged 5.1 main to 5.1-rplSven Sandberg2008-08-043-13/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2008-07-316-30/+123
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge 5.1 -> 5.1-rplSven Sandberg2008-07-0618-822/+264
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ MergeMagnus Svensson2008-06-182-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 5.1->5.1-rplMagnus Svensson2008-05-3049-1534/+2295
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Bug#35943 Failure to create mysql.ndb_schema shoudl not be logged if tabe alr...unknown2008-04-091-2/+4
| | * | | | | | | | | | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-04-0377-1039/+2486
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2008-04-021-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit modeunknown2008-04-021-3/+5
| | * | | | | | | | | | | | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-03-252-8/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix after mergeunknown2008-02-281-6/+7
| | | * | | | | | | | | | | | | | | | | | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rplunknown2008-02-281-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Bug#33763 Mysqld leaves readonly mode for cluster tables too early - part2unknown2008-01-092-8/+15
| * | | | | | | | | | | | | | | | | | | | | merge 5.1-bugteam --> 5.1-bugteam (local)Alfranio Correia2009-01-293-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Sergey Petrunia2009-01-282-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ automerge 5.0-bugteam --> 5.1-bugteam (bug 39069)Gleb Shchepa2009-01-281-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Bug #39069: <row constructor> IN <table-subquery> seriouslyGleb Shchepa2009-01-281-0/+5
| | | | * | | | | | | | | | | | | | | | | | | | Merge from team tree.Chad MILLER2009-01-268-15/+74
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Fix for BUG#39886 - Table full for MEMORY table is not written into error logSatya B2009-01-281-0/+4
| | * | | | | | | | | | | | | | | | | | | | | | BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong resultSergey Petrunia2009-01-281-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | BUG#35583 mysqlbinlog replay fails with ERROR 1146 when temp tables are usedAlfranio Correia2009-01-282-0/+4
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge fix for bug 38145 from 5.0.Chad MILLER2009-01-262-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge from dev tree.Chad MILLER2009-01-142-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
View Lorry Controller Status