summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* 5.1 -> 5.5 mergeSergey Glukhov2012-08-093-6/+7
|\
| * Bug #14409015 MEMORY LEAK WHEN REFERENCING OUTER FIELD IN HAVINGSergey Glukhov2012-08-093-6/+7
| * Merge from mysql-5.1.65-releaseSunanda Menon2012-08-091-2/+1
| |\
| | * Merge unpushed changes from 5.1.64-releaseBjorn Munch2012-07-121-2/+1
| | |\
| | | * Solve a linkage problem with "libmysqld" on several Solaris platforms:Kent Boortz2012-06-261-2/+1
| | | * Fixing wrong comment syntax (discovered by Kent)Joerg Bruehe2012-06-211-1/+1
* | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-072-3/+3
|\ \ \ \ | |/ / /
| * | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-072-4/+4
* | | | Bug#13058122 - DML, LOCK/UNLOCK TABLES AND SELECT LEAD TO Praveenkumar Hulakund2012-08-072-8/+118
* | | | Merge from 5.1 to 5.5Chaithra Gopalareddy2012-08-061-17/+34
|\ \ \ \ | |/ / /
| * | | Bug #14099846: EXPORT_SET CRASHES DUE TO OVERALLOCATION OF MEMORYChaithra Gopalareddy2012-08-051-17/+34
* | | | merge 5.1 => 5.5Tor Didriksen2012-07-271-4/+2
|\ \ \ \ | |/ / /
| * | | Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERTTor Didriksen2012-07-271-3/+2
* | | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-07-261-0/+8
|\ \ \ \ | |/ / /
| * | | BUG#13868860 - LIMIT '5' IS EXECUTED WITHOUT ERROR WHEN '5' Praveenkumar Hulakund2012-07-261-0/+8
* | | | merge 5.1 => 5.5Tor Didriksen2012-07-261-3/+7
|\ \ \ \ | |/ / /
| * | | Backport of Bug#14171740 65562: STRING::SHRINK SHOULD BE A NO-OP WHEN ALLOCED=0Tor Didriksen2012-07-261-3/+7
* | | | Bug#13699303 - THREAD POOL PLUGIN IGNORES TIMEOUT.Thayumanavar2012-07-251-0/+23
* | | | Bug#13961678:MULTI-STATEMENT TRANSACTION REQUIRED MORE THANSujatha Sivakumar2012-07-241-4/+4
* | | | Merging from 5.1Alexander Barkov2012-07-241-1/+1
|\ \ \ \ | |/ / /
| * | | Fixing wrong copyright. Index.xml was modified in 2005,Alexander Barkov2012-07-241-1/+1
* | | | Merge from 5.1 to 5.5Chaithra Gopalareddy2012-07-181-2/+9
|\ \ \ \ | |/ / /
| * | | Bug#11762052: 54599: BUG IN QUERY PLANNER ON QUERIES WITHChaithra Gopalareddy2012-07-181-2/+9
* | | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-07-121-2/+27
|\ \ \ \ | |/ / /
| * | | Bug #11765218 58157: INNODB LOCKS AN UNMATCHED ROW EVEN THOUGH USINGAnnamalai Gurusami2012-07-121-2/+27
| |/ /
| * | merge from 5.1 repo.Andrei Elkin2012-07-103-7/+24
| |\ \
* | | | Bug #13444084:PRIMARY KEY OR UNIQUE KEY >453 BYTES FAILS FORChaithra Gopalareddy2012-07-111-3/+4
* | | | bug#11759333:Rohit Kalhans2012-07-101-16/+10
* | | | Bug#13889741: HANDLE_FATAL_SIGNAL IN _DB_ENTER_ |HANDLE_FATAL_SIGNAL IN STRNLENMayank Prasad2012-07-101-2/+5
* | | | Bug#12623923 Server can crash after failure to createJon Olav Hauglid2012-07-101-8/+41
* | | | BUG#11759333: SBR LOGGING WARNING MESSAGES FOR PRIMARYRohit Kalhans2012-07-101-5/+139
* | | | merge from 5.5 repo.Andrei Elkin2012-07-103-7/+24
|\ \ \ \
| * \ \ \ merge from 5.1 to 5.5Sujatha Sivakumar2012-07-103-7/+24
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-103-7/+24
* | | | | merge from 5.5 repo.Andrei Elkin2012-07-061-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Bug #12910665: AUTH-PLUGIN-DATA-LEN NOT TESTED FOR VALIDITY BY THE Georgi Kodinov2012-06-291-0/+1
* | | | | merge bug14275000 fixes to 5.5: sql/log_event.h.Andrei Elkin2012-07-051-9/+1
* | | | | merge bug14275000 fixes to 5.5Andrei Elkin2012-07-052-5/+29
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Bug#14275000Andrei Elkin2012-07-052-5/+22
| |/ /
* | | auto-mergeGleb Shchepa2012-06-292-2/+2
|\ \ \ | |/ /
| * | minor update to make MSVS happyGleb Shchepa2012-06-292-2/+2
* | | merge bug#13708485 5.1->5.5Georgi Kodinov2012-06-291-1/+3
|\ \ \ | |/ /
| * | Bug #13708485: malformed resultset packet crashes clientGeorgi Kodinov2012-06-281-1/+3
* | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-294-9/+9
|\ \ \ | |/ /
| * | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-293-19/+20
* | | manual merge (WL6219)Gleb Shchepa2012-06-292-1/+28
|\ \ \ | |/ /
| * | Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(...Gleb Shchepa2012-06-292-1/+28
| * | Merge.Norvald H. Ryeng2012-06-282-1/+7
| |\ \ | | |/ | |/|
* | | Bug#14248833: UPDATE ON INNODB TABLE ENTERS RECURSIONEvgeny Potemkin2012-06-281-0/+9
* | | MergeNorvald H. Ryeng2012-06-282-1/+7
|\ \ \