summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Manual merge (again)konstantin@mysql.com2005-05-143-4/+33
|\
| * If the system is under high load 'show full processlist' might report the mleich@mysql.com2005-05-122-8/+9
| * bug#10344: some string function fail for UCS2bar@noter.(none)2005-05-102-0/+28
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-1317-117/+209
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-1317-117/+209
| |\ \
| | * | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...monty@mishka.local2005-05-1317-117/+209
* | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-132-0/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-092-0/+54
| |\ \ \
| | * \ \ mergebell@book.sanja.is.com.ua2005-05-092-0/+54
| | |\ \ \
| | | * | | Item::fix_field need correct pointer on item reference to chnge it if itis ne...bell@book.sanja.is.com.ua2005-05-092-0/+54
* | | | | | Fixed bug 10465.jani@a193-229-222-105.elisa-laajakaista.fi2005-05-122-0/+19
* | | | | | fix (Bug #8295 and #8296: varchar and varbinary conversion)ramil@mysql.com2005-05-123-1/+16
* | | | | | Manual mergeigor@rurik.mysql.com2005-05-102-23/+39
|\ \ \ \ \ \
| * | | | | | Many files:igor@rurik.mysql.com2005-05-102-23/+42
* | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-102-0/+37
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-102-0/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it return...gluh@mysql.com2005-05-062-0/+37
* | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-102-8/+63
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-1017-8/+214
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-072-8/+63
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog":gbichot@quadita2.mysql.com2005-05-062-8/+63
* | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ibmlab.site2005-05-102-0/+27
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed Bug#10232: update with subquery, precision math,jani@ibmlab.site2005-05-102-0/+27
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-05-101-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-05-101-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not ava...sergefp@mysql.com2005-05-101-0/+2
* | | | | | | | | | | Mergejimw@mysql.com2005-05-094-0/+35
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | SUBSTR with negative argument didn't workbar@noter.(none)2005-05-092-0/+9
| * | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1antony@ltantony.mysql.com2005-05-092-0/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#8733 - server accepts malformed query (multiply mentioned distinct)antony@ltantony.mysql.com2005-05-092-0/+26
* | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-092-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | after merge fixgluh@mysql.com2005-05-091-4/+3
| * | | | | | | | | | | | manual mergegluh@mysql.com2005-05-092-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix for bug #9404: information_schema: Weird error messages with SELECT SUM()...gluh@mysql.com2005-05-092-1/+11
* | | | | | | | | | | | | Manual merge of fix for bug #9913 into 5.0 tree.dlenev@mysql.com2005-05-091-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | - added "--skip-comments" to the "mysqldump" test to avoid printing comments ...lenz@mysql.com2005-05-092-30/+2
| * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-05-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | - fix the range test to pass when InnoDB is note enabled (e.g. in the "-class...lenz@mysql.com2005-05-091-0/+2
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Brian's mysqldump test modifications made on Ramil's laptop.ramil@ram-book.(none)2005-05-092-40/+12
* | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-092-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().ramil@ram-book.(none)2005-05-092-0/+18
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Mergebrian@zim.(none)2005-05-082-0/+99
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@brian-akers-computer.local2005-05-082-0/+98
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Patch for --insert-ignorebrian@brian-akers-computer.local2005-05-072-0/+98
* | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0antony@ltantony.mysql.com2005-05-072-7/+27
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@trift-lap.fambruehe2005-05-072-7/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).joerg@trift-lap.fambruehe2005-05-072-7/+27
* | | | | | | | | | | | Mergeantony@ltantony.mysql.com2005-05-074-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666antony@ltantony.mysql.com2005-05-072-0/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#9666 - Can't use 'DEFAULT FALSE' for column of type boolantony@ltantony.mysql.com2005-05-072-0/+22
View Lorry Controller Status