summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added more descriptive error message of why statement was automaticly droppedunknown2007-04-139-75/+114
* Fixed result.unknown2007-04-111-0/+2
* Added warn_root as argument for push_back()unknown2007-04-111-1/+1
* Patch for displaying questions per second average correctly.unknown2007-04-101-4/+9
* Small fixes for merge.unknown2007-04-105-11/+11
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-1095-872/+1933
|\
| * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-052-33/+41
| |\
| * | Fixes for tests after merge from 5.0unknown2007-04-058-152/+151
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-0494-986/+2046
| |\ \
| | * | Fixed previous patch, wrong if() -test.unknown2007-04-041-2/+2
| | * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-04-0344-372/+1041
| | |\ \
| | | * | Manual merge from 5.0unknown2007-03-297-21/+23
| | | * | Merged from 5.0unknown2007-03-292-2/+6
| | | * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-2926-454/+1248
| | | |\ \
| | | * \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvelunknown2007-03-2941-342/+1011
| | | |\ \ \
| | | | * \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainunknown2007-03-2813-33/+35
| | | | |\ \ \
| | | | | * | | Fixes for 4.1 to be as in 5.0 and above.unknown2007-03-274-4/+5
| | | | | * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-03-2689-254/+353
| | | | | |\ \ \
| | | | | | * | | Fixed compiler warnings.unknown2007-03-2289-254/+353
| | | | * | | | | Fix for BUG#25082: default database change on triggerunknown2007-03-278-137/+303
| | | | * | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-242-15/+5
| | | | |\ \ \ \ \
| | | | | * | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()unknown2007-03-242-15/+5
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-2425-87/+374
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() unknown2007-03-241-1/+1
| | | | | * | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() unknown2007-03-243-9/+6
| | | | | * | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-248-14/+182
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-238-14/+182
| | | | | | |\ \ \ \ \
| | | | | * | \ \ \ \ \ Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-2314-69/+140
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | | * | | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()unknown2007-03-2314-69/+140
| | | | | * | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-233-1/+52
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Bug #27354 stored function in where condition was always treated as constunknown2007-03-223-1/+52
| | | | * | | | | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-buildunknown2007-03-243-15/+14
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-buildunknown2007-03-2311-84/+490
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-233-4/+55
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | Bug#27171 mysqlbinlog produces different output depends from option -Runknown2007-03-223-4/+55
| | | | | * | | | | | | | | | Fix for BUG#9504: Stored procedures: execute privilege doesn'tunknown2007-03-235-40/+233
| | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Fix for BUG#24040: Create View don't succed with "all privileges"unknown2007-03-223-40/+203
| | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | * | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-282-12/+8
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Small fixes.unknown2007-03-272-12/+8
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-04-0361-528/+922
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-03-2927-456/+1252
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-03-2862-528/+924
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fixed error found by valgrind in numerical date handlingunknown2007-03-261-11/+12
| | | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-2419-144/+271
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Bug #26817: mysqldump fails to backup database containing view with invalid d...unknown2007-03-241-1/+1
| | | | | * | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-238-14/+182
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge sin.intern.azundris.com:/home/tnurnberg/26817/50-26817unknown2007-03-238-14/+182
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|/ / / / | | | | | | | |/| | | | | | | |
| | | | | | | * | | | | | | | | Bug #26817: mysqldump fails to backup database containing view with invalid d...unknown2007-03-238-14/+182
| | | | | * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-03-2299-1119/+3643
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-213-22/+24
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \