summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-5/+15
|\
| * 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
| * | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-221-2/+2
| * | | | Bug #34707: Row based replication: slave creates table within wrong databaseMats Kindahl2008-08-191-0/+19
| * | | | Auto mergeHe Zhenxing2008-08-061-7/+5
| |\ \ \ \
| * | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2008-07-311-1/+7
* | | | | | post-review fixesSergei Golubchik2009-01-151-2/+2
* | | | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-1/+1
* | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+27
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge Bug#28323 to mysql-5.1.29-rcDavi Arnaut2008-10-211-1/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Bug#28323: Server crashed in xid cache operationsDavi Arnaut2008-10-211-1/+3
| * | | | | WL4403: --general_log and --slow_query_log don't turn on the logging.Georgi Kodinov2008-10-091-0/+1
| * | | | | fixed a compilation problem in 5.1-5.1.29-rcGeorgi Kodinov2008-10-081-2/+2
| * | | | | Bug #34707: Row based replication: slave creates table within wrong databaseMats Kindahl2008-10-081-0/+19
| * | | | | Fix for BUG#31612Guilhem Bichot2008-10-061-0/+3
| * | | | | auto-mergeTatiana A. Nurnberg2008-09-171-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT...Tatiana A. Nurnberg2008-09-171-0/+1
* | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-8/+129
|\ \ \ \ \ | |/ / / /
| * | | | BUG#32709: Assertion failed: trx_data->empty(), file log.ccMats Kindahl2008-09-031-1/+5
| * | | | Bug #32709: Assertion failed: trx_data->empty(), file log.ccMats Kindahl2008-09-031-0/+1
| * | | | Cherry picking patch for BUG#37051He Zhenxing2008-08-261-1/+7
| | |_|/ | |/| |
| * | | Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-07-141-7/+5
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending onMarc Alff2008-07-141-7/+5
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-05-201-1/+77
| |\ \
| | * | Bug#27430 "Crash in subquery code when in PS and table DDL changed after unknown2008-05-201-15/+14
| | * | Implement some code review fixes for the fix for Bug#27430 unknown2008-05-181-3/+15
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-04-191-1/+66
| | |\ \
| | | * | WL#4165 "Prepared statements: validation".unknown2008-04-171-21/+2
| | | * | Tentative implementation ofunknown2008-04-081-1/+85
| * | | | Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take unknown2008-05-131-0/+34
| |/ / /
* | | | wt: comments, OOM checks, test case for deadlock detectionSergei Golubchik2008-08-281-5/+0
* | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeoutsSergei Golubchik2008-08-081-0/+8
* | | | move wt* maintainance from maria to the serverSergei Golubchik2008-08-071-0/+2
* | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-9/+37
|\ \ \ \ | |/ / /
| * | | Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.1-new-rplunknown2008-03-261-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | BUG#33029 5.0 to 5.1 replication fails on dup key when insertingunknown2008-03-141-0/+1
| * | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-03-051-1/+0
| |\ \ \ | | |/ /
| | * | Removed the unused function int THD::binlog_flush_transaction_cache()unknown2008-02-201-1/+0
| * | | Merge buzz.(none):/home/davi/mysql-5.0-runtimeunknown2008-02-281-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210unknown2008-02-281-1/+1
| | * | Merge mhansson@bk-internal:/home/bk/mysql-5.0-optunknown2007-12-151-3/+34
| | |\ \
| | | * | Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take unknown2007-12-131-3/+34