summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-112-0/+39
|\
| * Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611msvensson@pilot.blaudden2007-04-112-0/+11
| |\
| | * Bug#21611 Slave can't connect when master-ssl-cipher specifiedmsvensson@pilot.blaudden2007-04-024-0/+84
| * | Add test for connect using different ssl ciphersmsvensson@pilot.blaudden2007-04-112-0/+28
| * | Add replace_result for things that are not testedmsvensson@pilot.blaudden2007-04-112-3/+3
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-101-0/+15
|\ \ \ | |/ /
| * | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-04-101-0/+15
| |\ \
| | * | Update result(which mysterioulsy got lost)msvensson@pilot.blaudden2007-04-101-0/+15
| | * | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1msvensson@pilot.blaudden2007-04-102-0/+119
| | |\ \
| | | * \ Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/hfmain.(none)2007-04-072-0/+119
| | | |\ \
| * | | \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-04-1011-9/+162
| |\ \ \ \ \
* | \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-107-10/+87
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-102-0/+34
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-04-102-0/+34
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge 192.168.0.4:mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-04-102-0/+34
| | | |\ \ \ \ \
| | | | * | | | | Add "query_sorted" command to mysqltestmsvensson@shellback.(none)2007-04-052-0/+34
| | | * | | | | | Bug#27344 Total failure to start the servermsvensson@pilot.blaudden2007-04-041-1/+1
| | * | | | | | | Give the "sync_slave_with_master" something to domsvensson@pilot.blaudden2007-04-102-0/+2
| | * | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-109-9/+126
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-107-10/+53
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-041-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug#27344 Total failure to start the servermsvensson@pilot.blaudden2007-04-041-1/+1
| | * | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-047-9/+52
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Skip test cases if the script or binary they need can't be found msvensson@pilot.blaudden2007-04-044-8/+22
| | | * | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-04-042-0/+18
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Add expansion of $variables in "let from query",msvensson@pilot.blaudden2007-04-042-0/+18
| | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1msvensson@pilot.blaudden2007-04-023-39/+219
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Only check for warnings produced by mysqltest if --check-testcasesmsvensson@pilot.blaudden2007-04-041-5/+8
| | | * | | | | | | | Look for "testname.warnings" file produced by mysqltest, could findmsvensson@pilot.blaudden2007-04-023-0/+82
* | | | | | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-092-0/+25
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-04-094-0/+37
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-04-094-0/+37
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2007-04-084-0/+37
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge acurtis@bk-internal:/home/bk/mysql-5.0-enginesacurtis/antony@xiphis.org/ltamd64.xiphis.org2007-04-064-0/+37
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / | | | | |/| | | | | | | | |
| * | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-072-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-072-0/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#27586: Wrong autoinc value assigned by LOAD DATA in theevgen@moonbone.local2007-04-072-0/+25
| * | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-04-076-1/+180
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-04-052-0/+279
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold/marty@mysql.com/linux.site2007-04-052-0/+279
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2007-04-052-0/+279
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttomas@whalegate.ndb.mysql.com2007-04-052-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / / | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-04-051-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndbJustin.He/justin.he@dev3-240.dev.cn.tlan2007-04-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@quadxeon.mysql.com2007-04-042-5/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@recycle.(none)2007-04-021-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-04-0239-171/+1359
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-04-096-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2007-04-086-2/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-04-066-2/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |