summaryrefslogtreecommitdiff
path: root/mysql-test/include
Commit message (Expand)AuthorAgeFilesLines
* Automerge part of mysql-trunk-bugfixing into mysql-trunk-merge.Joerg Bruehe2010-06-211-0/+3
|\
| * Bug #53261 MTR tests archive_plugin and blackhole_plugin fail when compiling ...Tor Didriksen2010-06-141-0/+3
* | Manual merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-076-1/+341
|\ \ | |/
| * merge of patch for bug#52913 from 5.1-bugteam to trunk-bugfixing. Changed $ba...Horst.Hunger2010-06-041-0/+5
| * Patch for trunk after merge from 5.1-bugteam of bug52913.Horst.Hunger2010-06-031-0/+116
| * Skip perfschema.misc if "var" is a symlink (due to Bug 51447).Tor Didriksen2010-06-031-1/+6
| * Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-05-214-0/+309
| |\
| | * merge from mysql-trunk-runtimeJon Olav Hauglid2010-05-214-0/+309
| | |\
| | | * Follow-up for the fix for bug #46947 "Embedded SELECT without Dmitry Lenev2010-05-212-0/+12
| | | * manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-05-185-4/+6
| | | |\
| | | * \ Merge trunk -> trunk-runtime.Konstantin Osipov2010-05-131-0/+5
| | | |\ \
| | | * \ \ merge from mysql-trunk-bugfixingJon Olav Hauglid2010-05-052-0/+10
| | | |\ \ \
| | | * | | | Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-284-0/+297
| * | | | | | Merge mysql-trunk-bugfixing -> mysql-trunk-innodbVasil Dimov2010-05-192-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge mysql-trunk into mysql-trunk-innodbVasil Dimov2010-05-116-2/+28
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Move InnoDB tests from storage/innobase/mysql-test/ (where they were ignored)Vasil Dimov2010-04-141-0/+26
* | | | | | | mergeGeorgi Kodinov2010-06-041-0/+121
|\ \ \ \ \ \ \
| * | | | | | | Patch for bug#52913: Inserted check if mysqlhotcopy script is existing as req...Horst.Hunger2010-06-041-0/+5
| * | | | | | | Patch for bug#52913 including all review results and changes of date format.Horst.Hunger2010-06-031-0/+116
* | | | | | | | Manual merge2010-05-281-23/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Postfix for BUG#497412010-05-281-6/+17
| * | | | | | | A 5.1-only version of fix for bug #46947 "Embedded SELECTDmitry Lenev2010-05-284-0/+309
* | | | | | | | Manual merge2010-05-2619-122/+318
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Bug #49741 test files contain explicit references to bin/relay-log positions2010-05-2417-62/+272
| * | | | | | merged 5.1-innodb Georgi Kodinov2010-05-011-0/+4
| |\ \ \ \ \ \
| | * | | | | | Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ whereVasil Dimov2010-04-091-0/+4
| * | | | | | | Backport revision alik@sun.com-20100223131824-comthndat57kx8s5:Davi Arnaut2010-04-091-0/+2
| |/ / / / / /
* | | | | | | reverting fixes for Bug@50316 in mysql-trunkAndrei Elkin2010-05-183-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | merging bug#50316 fixesAndrei Elkin2010-05-183-3/+3
|\ \ \ \ \ \
| * | | | | | bug#50316 Add Master_info_file to SHOW SLAVE STATUSAndrei Elkin2010-05-163-3/+3
* | | | | | | Patch for Bug#52410 (Test "mysqld--help-*": further output differences).Alexander Nozdrin2010-05-171-1/+1
|/ / / / / /
* | | | | | Patch for Bug#21818 (Return value of ROW_COUNT() is incorrectAlexander Nozdrin2010-05-141-0/+2
| |_|/ / / |/| | | |
* | | | | Patch for 47759 to trunk-bugfixing.Horst.Hunger2010-05-051-0/+5
| |_|_|/ |/| | |
* | | | only This is a backport of the patch for 47739 into trunk. Horst.Hunger2010-04-261-0/+5
* | | | backport of patch for blckhole plugin (47748) to trunk-bugfixing.Horst.Hunger2010-04-261-0/+5
| |_|/ |/| |
* | | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside aAlfranio Correia2010-04-211-2/+2
* | | BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside aAlfranio Correia2010-04-201-0/+3
* | | Backport of:Konstantin Osipov2010-04-131-0/+8
| |/ |/|
* | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2444-106/+5130
|\ \
| * | Skip perfschema.misc if "var" is a symlink (due to Bug 51447).Alexander Nozdrin2010-03-161-0/+13
| * | Merge in fix for bug#42589Magnus Blåudd2010-03-151-8/+0
| |\ \
| | * | Bug#42589 mysql_fix_privilege_tables.sh to be deprecatedMagnus Blåudd2009-10-071-8/+0
| * | | Fixing non-determenistic results.Alexander Barkov2010-03-051-4/+2
| * | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-03-044-8/+1663
| |\ \ \
| | * \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-028-8/+1686
| | |\ \ \
| | | * \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-016-0/+1682
| | | |\ \ \
| | | | * \ \ Mergine from mysql-next-meAlexander Barkov2010-02-2718-49/+1199
| | | | |\ \ \
| | | | * | | | A post-fix for WL#2649 Number-to-string conversionAlexander Barkov2010-02-111-6/+7
| | | | * | | | WL#2649 Number-to-string conversionsAlexander Barkov2010-02-111-0/+1605
| | | * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-242-8/+4
| | | |\ \ \ \ \