summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge 5.1-security->5.5-securityGeorgi Kodinov2011-06-165-0/+86
|\
| * empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-06-160-0/+0
| |\
| | * auto-merge of version update from mysql-5.0 to mysql-5.0-securityGeorgi Kodinov2011-06-160-0/+0
| | |\
| | * | Raise version number after cloning 5.0.94Sunanda Menon2011-06-101-2/+2
| * | | auto-merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-06-1637-44/+843
| |\ \ \
| * | | | Fixed bug#11840395 (formerly known as bug#60347: THE STRING "VERSIONDATA"Dmitry Shulga2011-06-095-0/+86
| * | | | Raise version number after cloning 5.1.58Karen Langford2011-06-091-1/+1
* | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-1660-115/+2673
|\ \ \ \ \
| * | | | | BUG#11882110: UPDATE REPORTS ER_KEY_NOT_FOUND IF TABLE IS Jorgen Loland2011-06-166-14/+190
| * | | | | Skip test run with valgrind as test has restarts Vinay Fisrekar2011-06-161-0/+2
| * | | | | Fixed bug#12403662 (formerly known as bug#60987): LOAD DATA LOCAL INFILEDmitry Shulga2011-06-151-1/+1
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-157-20/+22
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Introduce UNIV_BLOB_NULL_DEBUG for temporarily hiding Bug#12650861.Marko Mäkelä2011-06-1514-42/+44
| * | | | | Bug#12561297 : Disable test main.mysql_embedded since it is failing on all pl...Anitha Gopi2011-06-151-0/+1
| * | | | | Null merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-140-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge a fix from mysql-5.5 to mysql-5.1:Marko Mäkelä2011-06-141-3/+0
| * | | | | BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.Mayank Prasad2011-06-143-2/+13
| * | | | | mergeMattias Jonsson2011-06-136-0/+1356
| |\ \ \ \ \
| | * | | | | Bug#11746819:Mattias Jonsson2011-03-166-0/+1356
| * | | | | | mergeMattias Jonsson2011-06-133-2/+67
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | mergeMattias Jonsson2011-06-133-3/+68
| | |\ \ \ \ \
| | | * | | | | bug#11765667: bug#58655: ASSERTION FAILED, SERVER CRASHES WITH MYSQLD GOT SIG...Mattias Jonsson2011-04-293-3/+68
| * | | | | | | Merged from mysql-5.1Karen Langford2011-06-100-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merged from mysql-5.0Karen Langford2011-06-100-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | increase version number to 5.0.95Karen Langford2011-06-101-2/+2
| | * | | | | | Raise version number after cloning 5.1.58Karen Langford2011-06-101-1/+1
| * | | | | | | Bug#12337762 : MYSQL_LIST_FIELDS() RETURNS WRONG CHARSET FOR CHAR/VARCHAR/TEXTMayank Prasad2011-06-102-18/+96
| * | | | | | | RETURN doesn't exactly return from the macro...Daniel Fischer2011-06-101-9/+8
| * | | | | | | Bug#12584161 - 43861: MAIN.QUERY_CACHE_28249 FAILS SPORADICALLYJon Olav Hauglid2011-06-103-8/+7
| * | | | | | | local mergeJorgen Loland2011-06-101-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | increased the version number to .15Sunanda Menon2011-06-101-1/+1
| * | | | | | | | BUG#12561818 - RERUN OF STORED FUNCTION GIVES ERROR 1172: Jorgen Loland2011-06-103-14/+107
| |/ / / / / / /
| * | | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree.Dmitry Shulga2011-06-107-14/+474
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-107-18/+464
| * | | | | | | Bug#12641810 - MYSQL MAKE DIST DOESN'T WORK WHEN USING MYSQL TREE + PLUGIN TR...Tor Didriksen2011-06-102-0/+24
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-091-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Disable a debug assertion that was added to track down Bug#12612184.Marko Mäkelä2011-06-092-2/+10
| * | | | | | | Auto-merge of follow-up for bug#11764334 from mysql-5.1 tree.Dmitry Shulga2011-06-102-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Follow-up for patch of bug#11764334.Dmitry Shulga2011-06-102-2/+4
| * | | | | | | Auto-merge of patch for bug#11764334 from mysql-5.1 tree.Dmitry Shulga2011-06-106-9/+50
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fixed bug#11764334 (formerly bug#57156): ALTER EVENT CHANGESDmitry Shulga2011-06-106-9/+50
| * | | | | | | Fix for bug #11759990 - "52354: 'CREATE TABLE .. LIKE ... 'Dmitry Lenev2011-06-093-0/+51
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-096-6/+88
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | BLOB instrumentation for Bug#12612184 Race condition in row_upd_clust_rec()Marko Mäkelä2011-06-0915-6/+188
| * | | | | | | Added regression test for bug#11763757 "56510: ERROR 42000:Dmitry Shulga2011-06-082-12/+63
| * | | | | | | Auto-merge from mysql-5.1Ramil Kalimullin2011-06-074-5/+61
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#11764487: myisam corruption with insert ignore and invalid spatial dataRamil Kalimullin2011-06-074-5/+61
| * | | | | | | Ignore auto-generated files (source_downloads).Alexander Nozdrin2011-06-071-0/+1
| * | | | | | | Non-functional change: Unbreak the Hot Backup build.Marko Mäkelä2011-06-062-1/+5
* | | | | | | | Cloning 5.5.14MySQL Release Engineering2011-06-091-1/+1