summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix for bug #8477 (Embedded query_cache test crashes)hf@deer.(none)2005-02-121-7/+11
* Embedded version of test fixedhf@deer.(none)2005-02-041-0/+12
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2005-02-049-16/+200
|\
| * Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2005-02-049-16/+200
| |\
| | * A fix: bug#6931: Date Type column problem when using UNION-Tablegluh@gluh.mysql.r18.ru2005-02-049-16/+200
* | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-02-042-0/+10
|\ \ \ | |/ / |/| |
| * | type_float.result.es updated.ramil@mysql.com2005-02-042-0/+10
* | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1timour@mysql.com2005-02-043-4/+24
|\ \ \
| * \ \ Merge mysql.com:/home/timka/mysql/src/4.1-dbgtimour@mysql.com2005-02-043-4/+24
| |\ \ \
| | * \ \ Merge mysql.com:/home/timka/mysql/src/4.1-dbgtimour@mysql.com2005-02-023-4/+24
| | |\ \ \
| | | * | | Fix for BUG#8023.timour@mysql.com2005-02-023-4/+24
* | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-02-044-6/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@pcgem.rdg.cyberkinetica.com2005-02-031-0/+28
| |\ \ \ \ \
| | * | | | | ndb - sol9x86: cc -xO3: fix optimizer error.pekka@mysql.com2005-02-031-0/+28
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@pcgem.rdg.cyberkinetica.com2005-02-033-6/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug#8057acurtis@pcgem.rdg.cyberkinetica.com2005-02-033-6/+18
* | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-02-031-0/+270
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | mtr_cases.pl:kent@mysql.com2005-02-031-0/+270
* | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mikael@orca.ndb.mysql.com2005-02-035-490/+668
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mysql-test-run.pl:kent@mysql.com2005-02-034-490/+667
| | |_|_|/ / | |/| | | |
* | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1mronstrom@mysql.com2005-02-032-14/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed a bug in the ndbd scheduler with send of packed signals.mronstrom@mysql.com2005-01-312-14/+22
* | | | | | made an .sh file of ndb-config-2-node.ini insteadtulin@mysql.com2005-02-032-3/+6
* | | | | | ndbcluster rpmstulin@mysql.com2005-02-032-0/+137
* | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-4.1lenz@mysql.com2005-02-0219-56/+67
|\ \ \ \ \ \
| * | | | | | Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=fullmonty@mysql.com2005-02-021-2/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-02-0218-54/+65
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-02-029-30/+45
| | |\ \ \ \ \
| | * | | | | | Fixed during review of new pulled codemonty@mysql.com2005-02-023-8/+18
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-02-0215-46/+47
| | |\ \ \ \ \ \
| | | * | | | | | Proper fix for comparision with ' 'monty@mysql.com2005-02-0115-46/+47
* | | | | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-4.1lenz@mysql.com2005-02-022-9/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-02-021-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | - typo fix...lenz@mysql.com2005-02-021-1/+1
| * | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-02-029-30/+45
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-02-021-8/+18
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Small Do-compile improvements:lenz@mysql.com2005-02-021-8/+18
* | | | | | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-4.1lenz@mysql.com2005-02-029-30/+45
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix merge of func_str tests (accidently duplicated a test).jimw@mysql.com2005-02-022-19/+14
| * | | | | | | | | Merge fixes for #8248, #5569.jimw@mysql.com2005-02-027-14/+29
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanjimw@mysql.com2005-02-011-2/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.0jimw@mysql.com2005-02-011-2/+0
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix QUOTE() to not reuse the input field for output, which resulted injimw@mysql.com2005-02-014-10/+18
| | |/ / / / / / / / /
| | * | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-5569jimw@mysql.com2005-02-013-4/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Always call vio_in_addr() so that thd->remote isjimw@mysql.com2005-01-253-4/+5
| * | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8207jimw@mysql.com2005-02-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add 'debug' to mysqladmin --help output. (Bug #8207)jimw@mysql.com2005-01-311-0/+1
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-02-021-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Make sure mysql_client_test and embedded test clients get added tojimw@mysql.com2005-02-011-4/+8
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | | | | | | | | | | | fix linkerror on sol9x86tulin@mysql.com2005-02-021-0/+9