summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-4.1unknown2007-03-241-2/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | nptl: typo fixed. sigaddset restoredunknown2007-03-241-2/+4
| | * | | | | | | | bug in im* tests - missing --no-defaults in the mysql command lineunknown2007-03-231-1/+1
| | * | | | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1unknown2007-03-232-15/+12
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | reverted linuxthreads thr_client_alarm fix (not future-proof)unknown2007-03-232-15/+12
| * | | | | | | | | 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 sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1unknown2007-03-232-11/+11
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge bk-internal:/home/bk/mysql-4.1-buildunknown2007-03-2377-17926/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-03-232-11/+11
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-03-232-11/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | move thr_client_alarm initialization to mysqld.ccunknown2007-03-232-7/+11
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2007-03-2375-17252/+109
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ 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-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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-03-1912-130/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Added find_type_or_exit and find_bit_type_or_exit as wrappersunknown2007-03-1912-130/+89
| * | | | | | | | | | | | | | | Removed not used define YY_MAGIC_BELOWunknown2007-03-2344-373/+641
* | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-03-2711-2096/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1unknown2007-03-2711-2096/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |