summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-052-0/+49
|\
| * Merge mysql.com:/usr/home/bar/mysql-4.1bar@mysql.com/bar.intranet.mysql.r18.ru2006-08-162-0/+49
| |\
| | * Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisonsbar@mysql.com2006-04-202-0/+49
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-0/+13
|\ \ \
| * | | Make the heap_btree test repeatable.ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-142-10/+10
| * | | mysqld --collation-server=xxx --character-set-server=yyybar@mysql.com/bar.intranet.mysql.r18.ru2006-08-113-1/+9
| |/ /
* | | Fix bad manual merge.cmiller@zippy.cornsilk.net2006-09-051-313/+0
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-052-4/+5
|\ \ \
| * \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-08-3132-337/+1747
| |\ \ \
| * | | | Disable testing of "encrypt" in ctype_ucs.testmsvensson@shellback.(none)2006-08-312-4/+5
| * | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50tsmith@maint2.mysql.com2006-08-3126-46/+571
| |\ \ \ \
* | \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-054-77/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-3132-337/+1747
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-291-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-281-0/+1
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-053-52/+56
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Post-merge fixes.kostja@bodhi.local2006-08-303-52/+55
| * | | | | | | Remove the fix for Bug#10668 "CREATE USER does not enforce username kostja@bodhi.local2006-08-302-3/+5
* | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-054-81/+317
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-3032-334/+1739
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0timour/tkatchaounov@dl145s.mysql.com2006-08-282-0/+22
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-056-0/+150
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clauseanozdrin/alik@alik.2006-08-248-0/+193
* | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-211-0/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-4.1.15440holyfoot/hf@mysql.com/deer.(none)2006-08-201-0/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug #15440 (handler.test hangs in embedded mode)holyfoot/hf@mysql.com/deer.(none)2006-07-251-0/+1
* | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51tsmith@maint2.mysql.com2006-09-0428-689/+1023
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mysql-test-run.pl:cmiller@maint1.mysql.com2006-09-021-1/+1
| * | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reordercmiller@maint1.mysql.com2006-09-011-27/+31
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reordercmiller@maint1.mysql.com2006-09-011-27/+31
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | mtr_cases.pl:cmiller@maint1.mysql.com2006-09-011-27/+31
| * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@neptunus.(none)2006-09-018-98/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Turn on reorder as default.msvensson@neptunus.(none)2006-09-011-1/+1
| | * | | | | | | | | | | | | Move test that requires innodb to "mysql_innodb"msvensson@neptunus.(none)2006-09-014-82/+83
| | * | | | | | | | | | | | | Turn off reorder as defaultmsvensson@neptunus.(none)2006-09-011-1/+1
| | * | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mtr/my51-mtrmsvensson@shellback.(none)2006-09-011-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtrmsvensson@shellback.(none)2006-09-011-1/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtrmsvensson@shellback.(none)2006-09-011-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Add target to make "mtr", shortcut for running test suitemsvensson@shellback.(none)2006-09-011-1/+6
| | * | | | | | | | | | | | | | | Use "--skip-innodb" if running with testcases that does not need innodbmsvensson@shellback.(none)2006-09-012-13/+5
| | * | | | | | | | | | | | | | | Only install the first masters db and copy it for the othermsvensson@shellback.(none)2006-08-312-2/+17
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fix results of mysqldump test after messy mergejimw@rama.(none)2006-08-311-138/+170
| * | | | | | | | | | | | | | | Merge rama.(none):/home/jimw/my/mysql-5.0-cleanjimw@rama.(none)2006-08-312-89/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.testjimw@rama.(none)2006-08-312-545/+248
| | * | | | | | | | | | | | | | Resolve conflictsjimw@rama.(none)2006-08-312-0/+342
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug #21288: mysqldump segmentation fault when using --wherejimw@rama.(none)2006-08-172-0/+35
| * | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@shellback.(none)2006-08-312-68/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Bug#21721 Test suite does not start with NDB, hangs forever; problem around "...msvensson@shellback.(none)2006-08-311-4/+20
| | * | | | | | | | | | | | | | | | Add check in 'spawn_impl' that we are not trying to span when the path to the...msvensson@shellback.(none)2006-08-311-0/+2