summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-02-0313-22/+77
|\
| * Fixed problems detected by pushbuildmonty@mysql.com/narttu.mysql.fi2007-01-301-1/+5
| * after merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-292-1/+2
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-2910-20/+70
| |\
| | * After merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-291-11/+6
| | * Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-2710-17/+72
| | |\
| | | * Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-01-223-10/+17
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelmonty@mysql.com/narttu.mysql.fi2007-01-222-4/+6
| | | |\
| | | | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0jani/jamppa@bk-internal.mysql.com2007-01-118-5/+59
| | | | |\
| | | | | * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-01-102-4/+6
| | | | | |\
| | | | | | * Added two possible error cases for a test.jani@ua141d10.elisa.omakaista.fi2007-01-102-4/+6
| | | | | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0jani/jamppa@bk-internal.mysql.com2007-01-096-1/+53
| | | | | |\ \
| | | * | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-226-1/+51
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-156-1/+53
| | | | |\ \ \ \
| | | | | * | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-156-1/+53
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-2456-231/+235
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-optjoerg@trift2.2007-02-0226-15/+618
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | after merge fixgluh@mysql.com/eagle.(none)2007-02-022-6/+6
| * | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-0217-4/+534
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries failgluh@mysql.com/eagle.(none)2007-02-012-0/+22
| | * | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-02-012-0/+50
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | trigger.result:gkodinov/kgeorge@rakia.gmz2007-02-011-25/+25
| | | * | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-02-012-0/+50
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug#23556: TRUNCATE TABLE still maps to DELETEgkodinov/kgeorge@macbook.gmz2006-11-212-0/+50
| | * | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-02-012-2/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug #25551: inconsistent behaviour in grouping NULL, depending on index typegkodinov/kgeorge@macbook.gmz2007-01-312-2/+41
| | * | | | | | | | | | | | Fixed bug #25407.igor@olga.mysql.com2007-01-313-2/+162
| | * | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-01-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-01-312-0/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | BUG#25575: ERROR 1052 (Column in from clause is ambiguous) with sub-joingkodinov/kgeorge@macbook.gmz2007-01-312-0/+67
| | * | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.gmz2007-01-302-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug #25643: SEC_TO_TIME function problemgkodinov/kgeorge@macbook.gmz2007-01-302-0/+26
| | * | | | | | | | | | | | | | | Fixed bug #24420.igor@olga.mysql.com2007-01-262-0/+33
| | * | | | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-01-262-0/+133
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653igor@olga.mysql.com2007-01-252-0/+133
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Fixed bug #24653.igor@olga.mysql.com2007-01-252-0/+133
| * | | | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optgkodinov/kgeorge@rakia.gmz2007-02-014-4/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Bug #23556: TRUNCATE TABLE still maps to DELETEgkodinov/kgeorge@macbook.gmz2006-11-214-4/+59
| * | | | | | | | | | | | | | | | | | mergingholyfoot/hf@mysql.com/hfmain.(none)2007-01-311-1/+1
| * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/25973/my50-25973holyfoot/hf@hfmain.(none)2007-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | bug #25973 (ps_1general.test fails in embedded server)holyfoot/hf@mysql.com/hfmain.(none)2007-01-311-1/+1
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@mysql.com/eagle.(none)2007-01-2629-45/+1573
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optsergefp@mysql.com2007-01-255-41/+856
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mockturtle.local2007-01-2512-37/+529
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/april.(none)2007-01-252-0/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/april.(none)2007-01-252-0/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2007-01-242-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0df@kahlann.erinye.com2007-01-246-0/+84
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge mhansson@bk-internal:/home/bk/mysql-5.1-optmhansson/martin@linux-st28.site2007-01-292-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | BUG#20604: FORCE INDEX uses keys disabled by ALTER TABLEmhansson/martin@linux-st28.site2007-01-292-0/+18