summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* auto-mergeTatjana Azundris Nuernberg2011-10-103-8/+58
|\
| * Merge from 5.1-securityMagne Mahre2011-10-073-8/+58
| |\
| | * BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHEMagne Mahre2011-10-073-8/+58
* | | manual mergeTatjana Azundris Nuernberg2011-10-061-9/+11
|\ \ \
| * \ \ manual mergeTatjana Azundris Nuernberg2011-10-061-9/+10
| |\ \ \
| | * | | additional clean-up for 11765687Tatjana Azundris Nuernberg2011-10-061-9/+10
* | | | | manual merge to reconcile with MySQL ticket 27145Tatjana Azundris Nuernberg2011-10-061-3/+33
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | manual mergeTatjana Azundris Nuernberg2011-09-291-2/+32
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug#11765687 (MySQL58677): No privilege on table / view, but can know #rows /...Tatjana Azundris Nuernberg2011-09-291-2/+32
* | | Manual merge from mysql-5.1-security.Alexander Nozdrin2011-09-232-3/+37
|\ \ \ | |/ /
| * | Fix for Bug#13001491: MYSQL_REFRESH CRASHES WHEN STORED ROUTINES ARE RUN CONC...Alexander Nozdrin2011-09-221-5/+39
| * | merge into 5.1-sec of bug#11766879.Mattias Jonsson2011-09-151-1/+19
| |\ \
| | * | Bug#11766879/Bug#60106: DIFF BETWEEN # OF INDEXES IN MYSQL VS INNODB,Mattias Jonsson2011-08-231-1/+19
| * | | Manual merge from mysql-5.1.Ramil Kalimullin2011-08-0913-69/+185
| |\ \ \
| * \ \ \ merge 5.0-security => 5.1-securityTor Didriksen2011-07-152-3/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-152-3/+4
* | | | | mergeMattias Jonsson2011-09-152-46/+162
|\ \ \ \ \
| * | | | | Bug#12696518: MEMORY LEAKS IN HA_PARTITION (VALGRIND TESTS ON TRUNK)Mattias Jonsson2011-09-152-46/+162
* | | | | | Bug#11764310 - 57132: CONV FUNCTION CRASHES, NEGATIVE ARGUMENT TO MEMCPYKristofer Pettersson2011-09-151-1/+4
|/ / / / /
* | | | | Bug11764310 - 57132: CONV FUNCTION CRASHES, NEGATIVE ARGUMENT TO MEMCPY Kristofer Pettersson2011-09-061-4/+6
* | | | | Bug#10064164 post-push fix: build break unless #defined HAVE_OPENSSLTor Didriksen2011-08-241-1/+1
* | | | | Bug10064164 Clean up of the protocol to avoid ambiguitiesKristofer Pettersson2011-08-231-40/+105
* | | | | Backport from trunk of:Tor Didriksen2011-08-193-21/+30
* | | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-135-7/+65
* | | | | mergeGeorgi Kodinov2011-08-121-5/+5
|\ \ \ \ \
| * | | | | Bug #12818542: PAM: ADDING PASSWORD FOR AN ACCOUNT DISABLES Georgi Kodinov2011-08-121-5/+5
* | | | | | Bug #11765565: 58548: 5.5.X NEEDS TO LINK TO THE CORESERVICES FRAMEWORK Georgi Kodinov2011-08-121-0/+8
|/ / / / /
* | | | | Manual merge from mysql-5.5.Ramil Kalimullin2011-08-0920-99/+319
|\ \ \ \ \
| * | | | | backport from mysql-trunkGleb Shchepa2011-08-031-5/+0
| * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-028-20/+23
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-028-20/+23
| | | |_|/ | | |/| |
| * | | | 5.1 -> 5.5 mergeSergey Glukhov2011-07-271-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP...Sergey Glukhov2011-07-271-1/+1
| * | | | Post-push fix for BUG#11809016.Alfranio Correia2011-07-241-1/+4
| * | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-0/+77
| * | | | Manual merge from mysql-5.1.Alexander Nozdrin2011-07-222-20/+8
| |\ \ \ \ | | |/ / /
| | * | | Manual merge from mysql-5.0.Alexander Nozdrin2011-07-222-30/+12
| | |\ \ \
| | | * | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENTAlexander Nozdrin2011-07-222-30/+14
| | | | |/ | | | |/|
| | | * | Merge from mysql-5.0.94-releaseSunanda Menon2011-07-0612-61/+144
| | | |\ \
| | | | * | Addendum 3 for bug #BUG#11764517 : expand secure_file_priv to the realGeorgi Kodinov2011-05-051-3/+17
| * | | | | merge mysql-5.5 (local) --> mysql-5.5Alfranio Correia2011-07-205-4/+28
| |\ \ \ \ \
| | * | | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ...Alfranio Correia2011-07-185-4/+28
| * | | | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LEN...Tor Didriksen2011-07-202-4/+4
| * | | | | | Bug#12711164 - 61676: RESULT OF DIV WITH DECIMAL AND INTEGER DOES NOT MAKE SE...Tor Didriksen2011-07-181-1/+6
| * | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2011-07-151-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()).Alexander Nozdrin2011-07-151-2/+2
| * | | | | | Automerge from mysql-5.1 into mysql-5.5.Luis Soares2011-07-151-4/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | DBUG_PRINT in solaris does not work well with NULL parameters.Luis Soares2011-07-151-4/+11
| * | | | | | BUG#11753004Luis Soares2011-07-141-12/+136
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | |
| | * | | | BUG#11753004: 44360: REPLICATION FAILEDLuis Soares2011-07-141-12/+136