summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGINTor Didriksen2012-10-244-1/+7
* local mergeTor Didriksen2012-10-2312-32/+170
|\
| * Use MESSAGE(STATUS ...) as we don't want any popup from the build system.Tor Didriksen2012-10-232-2/+2
| * Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-221-1/+5
| |\
| | * Backport from 5.6: Bug#14769820 ASSERT FLEN == LENMarko Mäkelä2012-10-221-1/+5
| * | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-212-9/+16
| |\ \ | | |/
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-212-9/+16
| * | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-210-0/+0
| |\ \ | | |/
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-213-7/+86
| | |\
| * | \ BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-213-7/+86
| |\ \ \
| | * \ \ BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-123-7/+86
| | |\ \ \ | | | | |/ | | | |/|
| | | * | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-123-7/+86
| * | | | Fix formatting in 'INFO_BIN' on Windows - backport.Joerg Bruehe2012-10-191-3/+5
| * | | | Upmerge a backport - emptyJoerg Bruehe2012-10-190-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Automerge into main 5.1Joerg Bruehe2012-10-191-3/+18
| | |\ \ \
| | | * | | Backport this change from MySQL 5.5 to 5.1:Joerg Bruehe2012-09-111-3/+18
| * | | | | Bug #14226171 EXCESSIVE ROW LOCKING WITH UPDATE IN 5.5.25Annamalai Gurusami2012-10-191-0/+31
| * | | | | Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-181-7/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#14758405: ALTER TABLE: ADDING SERIAL NULL DATATYPE: ASSERTION:Marko Mäkelä2012-10-183-14/+30
| * | | | | merge from mysql-5.1 -> mysql-5.5Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-0/+148
| |\ \ \ \ \ | | |/ / / /
| | * | | | bug#14765606: ensure select is active before killing it else kill signal is i...Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-8/+24
| * | | | | removing .... will re-add using merge. for some reason initial mysql-5.1 vers...Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-131/+0
| * | | | | NULL mergeTatjana Azundris Nuernberg2012-10-170-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | |\ \ \ \
* | | | | | | (no commit message)mysql-builder@oracle.com2012-10-170-0/+0
|/ / / / / /
* | | | | | Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90SYasufumi Kinoshita2012-10-171-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug #13702112 : WAIT_FOR_READ IS STUCK IN THE 90SYasufumi Kinoshita2012-10-171-3/+4
* | | | | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| |/ / / /
* | | | | Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPPORT BIGINT UNSIGNEDNeeraj Bisht2012-10-162-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPPORT BIGINT UNSIGNEDNeeraj Bisht2012-10-162-1/+3
* | | | | (no commit message)mysql-builder@oracle.com2012-10-160-0/+0
* | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-163-6/+35
|\ \ \ \ \ | |/ / / /
| * | | | Bug#14729221 IN-PLACE ALTER TABLE REPORTS '' INSTEAD OFMarko Mäkelä2012-10-164-7/+42
| * | | | bug#14704286Krunal Bauskar krunal.bauskar@oracle.com2012-10-154-1/+142
* | | | | removed warning message as they have changed in mysql-5.6 and mysql-trunk and...Krunal Bauskar krunal.bauskar@oracle.com2012-10-152-3/+2
* | | | | bug#14704286Krunal Bauskar krunal.bauskar@oracle.com2012-10-153-0/+137
* | | | | Merge mysql-5.1 --> mysql-5.5Marc Alff2012-10-122-12/+23
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Bug#14629232 SECURITY VULNERABILITY WITH SHOW PROFILEMarc Alff2012-10-122-12/+23
| | |/ | |/|
* | | Null merge mysql-5.1 -> mysql-5.5 (the problem fixed in 5.1 does notVasil Dimov2012-10-100-0/+0
|\ \ \ | |/ /
| * | Fix compilation error in debug mode:Vasil Dimov2012-10-102-28/+26
* | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2012-10-092-1/+17
|\ \ \ | |/ /
| * | Port the test for Bug#14708715 from 5.1/innodb_plugin into 5.1/innodbVasil Dimov2012-10-091-0/+16
| * | Update the ChangeLog with the fix of Bug#14708715Vasil Dimov2012-10-091-0/+5
| * | Fix Bug#14708715 CREATE TABLE MEMORY LEAK ON DB_OUT_OF_FILE_SPACEVasil Dimov2012-10-092-1/+20
* | | Bug #14211140: CRASH WHEN GRANTING OR REVOKING PROXYHarin Vadodaria2012-10-093-19/+47
* | | Fixing a compilation issue. Annamalai Gurusami2012-10-091-1/+1
* | | Bug#11756600 - SLAVE THREAD CAN CRASH IF EVENT SCHEDULER Praveenkumar Hulakund2012-10-081-5/+10