summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-2715-122/+197
|\
| * Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-06-2515-122/+197
| |\
| | * Fix for BUG#29318 "Statements prepared with PREPARE and with oneguilhem@gbichot3.local2007-06-234-82/+104
| | * Fix broken automatic dependency tracking of Automake in sql/:kostja@bodhi.(none)2007-06-221-18/+12
| | * Merge adventure.(none):/home/thek/Development/cpp/bug28846/my51-bug28846thek@adventure.(none)2007-06-2211-22/+81
| | |\
| | | * Bug #28846 Use of undocumented Prepared Statements crashes serverthek@adventure.(none)2007-06-221-0/+6
| | | * Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846thek@adventure.(none)2007-06-2211-22/+75
| | | |\
| | | | * Bug#28846 Use of undocumented Prepared Statements crashes serverthek@adventure.(none)2007-06-2211-21/+72
* | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optgshchepa/uchum@gleb.loc2007-06-251-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-06-251-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Raise version number after cloning 5.1.20-betajbruehe/mysqldev@mysql.com/production.mysql.com2007-06-251-1/+1
* | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-06-257-16/+60
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug #27084 partitioning by list seems failing when using caseholyfoot/hf@mysql.com/hfmain.(none)2007-03-277-16/+60
* | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-06-250-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/4.1-optgshchepa/uchum@gleb.loc2007-06-250-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/4.1gshchepa/uchum@gleb.loc2007-06-253-7/+69
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0gshchepa/uchum@gleb.loc2007-06-2526-46/+591
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-06-2539-196/+666
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-243-2/+49
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-243-2/+49
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed bug #25602. A query with DISTINCT in the select list to whichigor@olga.mysql.com2007-06-233-2/+49
| | * | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0gshchepa/uchum@gleb.loc2007-06-2424-44/+542
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rpl_skip_error.result:gshchepa/uchum@gleb.loc2007-06-251-2/+2
| * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-06-2537-194/+617
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-06-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/4.1-optgshchepa/uchum@gleb.loc2007-06-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-optgkodinov/kgeorge@magare.gmz2007-06-202-6/+68
| | | | |\ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-06-2415-35/+303
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095gshchepa/uchum@gleb.loc2007-06-243-2/+57
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fixed bug #29095.gshchepa/uchum@gleb.loc2007-06-243-2/+57
| | | * | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-06-221-11/+16
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Bug #27383: Crash in test "mysql_client_test"gkodinov/kgeorge@magare.gmz2007-06-221-11/+16
| | | * | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@hfmain.(none)2007-06-222-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-213-6/+52
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Fixed bug #29104: assertion abort for grouping queries using views.igor@olga.mysql.com2007-06-203-6/+52
| | | * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@hfmain.(none)2007-06-212-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@hfmain.(none)2007-06-213-0/+39
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Fixed bug #28293.gshchepa/uchum@gleb.loc2007-06-213-1/+24
| | | * | | | | | | | | | | | | | | port of the fix for bug 19116 4.1-opt -> 5.0-optgkodinov/kgeorge@magare.gmz2007-06-201-4/+66
| | | * | | | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B29116-4.1-optgkodinov/kgeorge@magare.gmz2007-06-201-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Bug #29116: Test "rpl_change_master" returns different gkodinov/kgeorge@magare.gmz2007-06-192-6/+68
| | | * | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898gshchepa/uchum@gleb.loc2007-06-202-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | metadata.test, metadata.result:gshchepa/uchum@gleb.loc2007-06-202-2/+2
| | | * | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28898gshchepa/uchum@gleb.loc2007-06-205-5/+85
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fixed bug #28898.gshchepa/uchum@gleb.loc2007-06-205-5/+85
| | * | | | | | | | | | | | | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-06-221-1/+1
| | * | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/28839/my50-28839holyfoot/hf@hfmain.(none)2007-06-222-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | rpl_skip_error.test fixedholyfoot/hf@mysql.com/hfmain.(none)2007-06-222-1/+2
| | | | |_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/28839/my50-28839holyfoot/hf@hfmain.(none)2007-06-212-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | rpl_skip_error test fixedholyfoot/hf@mysql.com/hfmain.(none)2007-06-212-1/+2
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |