summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2unknown2007-08-071-0/+8
|\
| * Reversing additional change suggested by Sergunknown2007-08-071-0/+8
| * Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rplunknown2007-08-033-0/+78
| |\
| | * After merge fixunknown2007-08-031-0/+1
| | * Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875unknown2007-08-033-0/+77
| | |\
| * | \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-08-021-0/+3
| |\ \ \
| | * | | Fix for bug #30088: Can't disable myisam-recover by a value of "".unknown2007-08-011-0/+3
* | | | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875unknown2007-08-033-0/+77
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#28875 Conversion between ASCII and LATIN1 charsets does not functionunknown2007-08-033-0/+78
* | | | | After-merge fix: result adjusted.unknown2007-08-021-0/+3
* | | | | Post-merge fix. Update some test results, and add an InnoDB-onlyunknown2007-08-022-19/+9
* | | | | Merge 50 -> 51 (-opt changesets)unknown2007-08-011-0/+66
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-0110-5/+366
| |\ \ \ \
| | * \ \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-08-014-1/+59
| | |\ \ \ \
| * | \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-311-0/+113
| |\ \ \ \ \ \
| | * | | | | | (pushing for Andrei)unknown2007-07-301-0/+113
| * | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-312-0/+43
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-311-0/+66
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-301-0/+66
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.unknown2007-07-301-0/+66
* | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-016-9/+326
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-312-0/+43
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29717/my50-29717unknown2007-07-312-0/+43
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | mergingunknown2007-07-312-0/+43
| | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | sql_yacc.yy, sp.result, disabled.def:unknown2007-07-311-4/+4
| * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-311-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed bug #30120.unknown2007-07-301-0/+11
| | |/ / / / / / /
| * | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-292-0/+134
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-0/+119
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#29856: Insufficient buffer space led to a server crash.unknown2007-07-281-0/+119
| | * | | | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-0/+70
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-0/+15
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#30020: Insufficient check led to a wrong info provided by theunknown2007-07-281-0/+15
| * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-281-0/+70
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834unknown2007-07-281-0/+70
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixed bug #29834.unknown2007-07-281-0/+71
| | * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-283-1/+34
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2007-07-281-0/+10
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Bug #29878 Garbage data generation when executing SESSION_USER() on a slave.unknown2007-07-271-0/+10
| | | * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-261-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#28591: make the fix work for BDB tables too:unknown2007-07-261-1/+1
| | | * | | | | | | | | | | Addendum to bug 29571: wait for INSERT DELAYED to finish on masterunknown2007-07-261-0/+3
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-261-0/+20
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug #29571: INSERT DELAYED IGNORE written to binary log on unknown2007-07-261-0/+20
| * | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-281-5/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | show_check.result:unknown2007-07-281-2/+0
| | * | | | | | | | | | | | | Bug #30000: SHOW commands once again ends up in the unknown2007-07-271-5/+65
| | * | | | | | | | | | | | | Bug #30036: SHOW TABLE TYPES causes the debug client to crashunknown2007-07-261-0/+1
* | | | | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-08-014-1/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0unknown2007-08-011-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |