diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:28:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-16 13:28:35 +0100 |
| commit | c1a65228757e25aabccfcf77c494811ed1e5a633 (patch) | |
| tree | b03a8303e1b94c975772db94079ee12e56818c15 /storage/connect/mysql-test | |
| parent | 4cee899fb71226285a34bf20a2380f63c93e3b6d (diff) | |
| parent | d28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (diff) | |
| download | mariadb-git-c1a65228757e25aabccfcf77c494811ed1e5a633.tar.gz | |
merge
Diffstat (limited to 'storage/connect/mysql-test')
| -rw-r--r-- | storage/connect/mysql-test/connect/r/mysql_new.result | 2 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/suite.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/connect/mysql-test/connect/r/mysql_new.result b/storage/connect/mysql-test/connect/r/mysql_new.result index a2e94645b0f..152d963efa7 100644 --- a/storage/connect/mysql-test/connect/r/mysql_new.result +++ b/storage/connect/mysql-test/connect/r/mysql_new.result @@ -204,7 +204,7 @@ t1 CREATE TABLE `t1` ( `a` date DEFAULT NULL, `b` datetime DEFAULT NULL, `c` time DEFAULT NULL, - `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `d` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `e` year(4) DEFAULT NULL ) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT' `TABLE_TYPE`='MYSQL' SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/suite.pm b/storage/connect/mysql-test/connect/suite.pm index 8ae5ca7d886..3bbeffca7d9 100644 --- a/storage/connect/mysql-test/connect/suite.pm +++ b/storage/connect/mysql-test/connect/suite.pm @@ -5,5 +5,7 @@ package My::Suite::Connect; return "No CONNECT engine" unless $ENV{HA_CONNECT_SO} or $::mysqld_variables{'connect'} eq "ON"; +sub is_default { 1 } + bless { }; |