mariadb/mysql-test/suite/mtr/t/simple,c2,s1.rdiff

--- 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
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 2012-02-23 07:50:11 +01:00			`--- 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`