summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* WL#2110 (SIGNAL)Marc Alff2009-09-101-171/+180
* merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-21/+36
|\
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-1/+1
| |\
| * | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+1
| * | Merge from 5.0Gleb Shchepa2009-07-241-21/+31
| |\ \
| | * | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-21/+31
| | * | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-1/+1
| | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-0/+11
| | |\ \
| | * \ \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-211-0/+7
| | |\ \ \
| | * \ \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-11/+19
| | |\ \ \ \
| | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-6/+38
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+8
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+8
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+8
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-0/+8
| | | | | |\ \ \ \ \ \ \
| * | | | | | | | | | | | Add a comment for thd->proc_info.Konstantin Osipov2009-07-221-0/+4
* | | | | | | | | | | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-4/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-3/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fix for a valgrind warning due to use of a uninitializedDavi Arnaut2009-06-081-1/+2
| | * | | | | | | | | | | Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()Davi Arnaut2009-06-051-0/+8
| | * | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-1/+1
| | * | | | | | | | | | | Bug#44658 Create procedure makes server crash when user does not have ALL pri...Kristofer Pettersson2009-05-291-1/+29
| * | | | | | | | | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-111-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Manual merge.Ramil Kalimullin2009-03-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Auto-mergeRamil Kalimullin2009-03-251-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaksRamil Kalimullin2009-03-251-0/+3
| * | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+1
| | |/ / / / / / / / / /
| | * | | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2009-03-051-0/+7
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | MergeSergey Petrunia2009-03-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ auto-mergeIgnacio Galarza2009-03-171-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | BUG#38826 Race in MYSQL_LOG::purge_logs is impossible to debug in productionLuis Soares2008-12-041-0/+7
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Bug#28323: Server crashed in xid cache operationsDavi Arnaut2008-10-211-1/+3
| | | * | | | | | | | | Bug#24289 Status Variable "Questions" gets wrong values with Stored RoutinesKristofer Pettersson2008-10-091-3/+10
| * | | | | | | | | | | MergeSergey Petrunia2009-03-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 !Guangbao Ni2009-03-051-0/+2
| | |/ / / / / / / / /
| * | | | | | | | | | - Backport @@optimizer_switch support from 6.0Sergey Petrunia2009-02-231-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-171-6/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-231-2/+9
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-051-1/+1
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(...Sergey Glukhov2008-12-171-2/+9
| * | | | | | | | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| | |/ / / / / / / / /
| * | | | | | | | | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-231-0/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-061-1/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Eliminating some compiler warnings.Mats Kindahl2008-08-251-0/+4