Automatic merge

fd1abdd4 · Michael Widenius · df9d8477 · 3608ec30 · fd1abdd4
Commit fd1abdd4 authored Feb 21, 2012 by Michael Widenius
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/suite/innodb_plugin/t/innodb_gis.test mysql-test/suite/innodb_plugin/t/innodb_gis.test +1 -1

No files found.
--- a/mysql-test/suite/innodb_plugin/t/innodb_gis.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_gis.test
-- source include/have_innodb_plugin.inc
+--source include/have_innodb_plugin.inc
 SET storage_engine=innodb;
 --source include/gis_generic.inc
 --source include/gis_keys.inc