diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 07:50:11 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 07:50:11 +0100 |
| commit | c39877071a5ce8ba3c8dc7a1963e3c542e6cc83b (patch) | |
| tree | cbab9d6a8cf2f5dd167bbffbddd92ebec30700eb /mysql-test/suite/mtr/t/simple,c2,s1.rdiff | |
| parent | ae0a7cfd5f75d80b4b0540258daa0e2ed051cd1b (diff) | |
| download | mariadb-git-c39877071a5ce8ba3c8dc7a1963e3c542e6cc83b.tar.gz | |
overlay support for mysql-test-run and mysqltest
mysql-test-run auto-disables all optional plugins.
mysql-test/include/default_client.cnf:
no @OPT.plugindir anymore
mysql-test/include/default_mysqld.cnf:
don't disable plugins manually - mtr can do it better
mysql-test/suite/innodb/t/innodb_bug47167.test:
mtr now uses suite-dir as an include path
mysql-test/suite/innodb/t/innodb_file_format.test:
mtr now uses suite-dir as an include path
mysql-test/t/partition_binlog.test:
this test uses partitions
storage/example/mysql-test/mtr/t/source.result:
update results. as mysqltest includes the correct overlayed include
storage/innobase/handler/ha_innodb.cc:
the assert is wrong
Diffstat (limited to 'mysql-test/suite/mtr/t/simple,c2,s1.rdiff')
| -rw-r--r-- | mysql-test/suite/mtr/t/simple,c2,s1.rdiff | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/mtr/t/simple,c2,s1.rdiff b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff new file mode 100644 index 00000000000..3023756aa8a --- /dev/null +++ b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff @@ -0,0 +1,11 @@ +--- suite/mtr/t/simple.result 2012-02-04 12:13:41.000000000 +0100 ++++ suite/mtr/t/simple,infile,verbose.reject 2012-02-04 12:16:10.000000000 +0100 +@@ -3,7 +3,7 @@ + proxy + select @@local_infile; + @@local_infile +-1 ++0 + select @@old; + @@old + 0 |