summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge rama.(none):/home/jimw/my/mysql-5.1-19874unknown2006-09-062-0/+28
|\
| * Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorr...unknown2006-09-012-0/+28
* | Fix merge problems; work around disparate "ls" behaviors.unknown2006-09-063-19/+11
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-09-062-7/+44
|\ \
| * | New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE".unknown2006-09-062-7/+44
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-052-2/+3
|\ \ \
| * \ \ Merge maint2.mysql.com:/data/localhome/tsmith/bk/41unknown2006-09-014-1/+73
| |\ \ \
| * \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-08-312-203/+248
| |\ \ \ \
* | \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | post-merge fixunknown2006-09-011-0/+1
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/41unknown2006-09-011-0/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-052-0/+22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-172-0/+23
| |\ \ \ \ \ \
| | * | | | | | Fix for bug #20695: Charset introducer overrides charset definition for column.unknown2006-08-152-0/+23
| * | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-162-0/+49
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-08-152-5/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge april.(none):/home/svoj/devel/bk/mysql-4.1unknown2006-08-142-0/+22
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-052-0/+49
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1unknown2006-08-162-0/+49
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#9509: Optimizer: wrong result after AND with latin1_german2_ci comparisonsunknown2006-04-202-0/+49
* | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Make the heap_btree test repeatable.unknown2006-08-142-10/+10
| * | | | | | | | | | mysqld --collation-server=xxx --character-set-server=yyyunknown2006-08-113-1/+9
| |/ / / / / / / / /
* | | | | | | | | | Fix bad manual merge.unknown2006-09-051-313/+0
* | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-052-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-08-3132-337/+1747
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable testing of "encrypt" in ctype_ucs.testunknown2006-08-312-4/+5
| * | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50unknown2006-08-3126-46/+571
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-054-77/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-3132-337/+1747
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-281-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-053-52/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Post-merge fixes.unknown2006-08-303-52/+55
| * | | | | | | | | | | | | Remove the fix for Bug#10668 "CREATE USER does not enforce username unknown2006-08-302-3/+5
* | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-054-81/+317
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-3032-334/+1739
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-282-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-056-0/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clauseunknown2006-08-248-0/+193
* | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-08-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-4.1.15440unknown2006-08-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug #15440 (handler.test hangs in embedded mode)unknown2006-07-251-0/+1
* | | | | | | | | | | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51unknown2006-09-0428-689/+1023
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | mysql-test-run.pl:unknown2006-09-021-1/+1
| * | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorderunknown2006-09-011-27/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorderunknown2006-09-011-27/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | mtr_cases.pl:unknown2006-09-011-27/+31
View Lorry Controller Status