summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* WL#3228 (NDB) : RBR using different table defs on slave/masterunknown2007-08-022-6/+7
* Merge mysql_cab_desk.:C:/source/c++/mysql-5.1unknown2007-08-02219-8555/+6117
|\
| * After-merge fix: result adjusted.unknown2007-08-021-0/+3
| * Merge mysql.com:/home/ram/work/b30088/b30088.5.0unknown2007-08-022-1/+6
| |\
| | * Fix for bug #30088: Can't disable myisam-recover by a value of "".unknown2007-08-013-1/+9
| * | Post-merge fix. Update some test results, and add an InnoDB-onlyunknown2007-08-022-19/+9
| * | Merge 50 -> 51 (-opt changesets)unknown2007-08-012-0/+172
| |\ \
| | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-01129-6049/+1238
| | |\ \
| | | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-08-0119-9/+716
| | | |\ \
| | | | * \ Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-08-0110-1/+284
| | | | |\ \
| | * | | \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-312-2/+233
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-314-0/+93
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-313-1/+173
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-311-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | bigint.test:unknown2007-07-301-1/+1
| | | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-302-0/+172
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.unknown2007-07-302-0/+172
| * | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-0120-9/+1065
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Addendum to bug 27417: poor test results fixes.unknown2007-07-313-10/+12
| | * | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-317-5/+129
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-314-0/+93
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29717/my50-29717unknown2007-07-314-0/+93
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | mergingunknown2007-07-312-0/+43
| | | | | * | | | | | | | | Merge mysql.com:/home/hf/work/29717/my41-29717unknown2007-07-312-0/+50
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | Merge mysql.com:/home/hf/work/029717/my41-29717unknown2007-07-314-0/+94
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even ifunknown2007-07-314-0/+94
| | | * | | | | | | | | | | | sql_yacc.yy, sp.result, disabled.def:unknown2007-07-312-5/+4
| | | * | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-312-0/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fixed bug #30120.unknown2007-07-302-0/+32
| | | | |/ / / / / / / / /
| | * | | | | | | | | | | merge of the fix for bug 17417 5.0-opt->5.1-optunknown2007-07-313-130/+132
| | * | | | | | | | | | | (Pushing for Andrei)unknown2007-07-302-0/+231
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | / / / / / | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | (pushing for Andrei)unknown2007-07-302-2/+233
| | | |/ / / / / / / /
| | * | | | | | | | | disabled.def:unknown2007-07-301-0/+1
| | * | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-294-0/+271
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-282-0/+243
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug#29856: Insufficient buffer space led to a server crash.unknown2007-07-282-0/+243
| | | * | | | | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-282-0/+144
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-282-0/+28
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug#30020: Insufficient check led to a wrong info provided by theunknown2007-07-282-0/+28
| | * | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-282-0/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834unknown2007-07-282-0/+144
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fixed bug #29834.unknown2007-07-282-0/+145
| | | * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-285-1/+86
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2007-07-282-0/+32
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / | | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-287-5/+286
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-282-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | rpl_session_var.test fixed to not depend on mysql_test_run parametersunknown2007-07-282-4/+4
| | | * | | | | | | | | | | | | | show_check.result:unknown2007-07-282-4/+0
| | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optunknown2007-07-282-0/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29878/my50-29878unknown2007-07-272-0/+32
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | |