null+****@clear*****
null+****@clear*****
2012年 2月 5日 (日) 14:47:49 JST
Kouhei Sutou 2012-02-05 14:47:49 +0900 (Sun, 05 Feb 2012)
New Revision: c97384db94a9da65361524f17ec468e0af88fe91
Log:
[mariadb] enable fractional seconds tests.
Copied files:
test/sql/include/have_mariadb.inc
(from test/sql/include/have_fractional_seconds.inc)
Modified files:
test/sql/include/have_fractional_seconds.inc
Modified: test/sql/include/have_fractional_seconds.inc (+13 -2)
===================================================================
--- test/sql/include/have_fractional_seconds.inc 2012-02-05 14:16:38 +0900 (a13a8ed)
+++ test/sql/include/have_fractional_seconds.inc 2012-02-05 14:47:49 +0900 (b896b90)
@@ -14,10 +14,21 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source include/have_mariadb.inc
+
+if ($have_mariadb)
+{
+ let $fractional_seconds = 1;
+}
+
+if (!have_mariadb)
+{
--disable_query_log
-let $fractional_seconds = `SELECT @@global.version >= '5.6'`;
+ let $fractional_seconds = `SELECT @@global.version >= '5.6'`;
--enable_query_log
+}
+
if (!$fractional_seconds)
{
- skip fractional seconds in time values are available in version 5.6 or later;
+ skip fractional seconds in time values are available in MySQL version 5.6 or later or MariaDB;
}
Copied: test/sql/include/have_mariadb.inc (+1 -5) 82%
===================================================================
--- test/sql/include/have_fractional_seconds.inc 2012-02-05 14:16:38 +0900 (a13a8ed)
+++ test/sql/include/have_mariadb.inc 2012-02-05 14:47:49 +0900 (f36b525)
@@ -15,9 +15,5 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--disable_query_log
-let $fractional_seconds = `SELECT @@global.version >= '5.6'`;
+let $have_mariadb = `SELECT LOCATE('MariaDB', @@global.version) > 0`;
--enable_query_log
-if (!$fractional_seconds)
-{
- skip fractional seconds in time values are available in version 5.6 or later;
-}