diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-01 11:02:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-02 09:36:04 +0300 |
| commit | 3d615e4b1aa4f945f69d310f9a19de80fbaccdca (patch) | |
| tree | 1d23c043ef41badf359760b70db84bc825a8b4a5 /mysql-test/r/partition_column.result | |
| parent | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (diff) | |
| parent | 959891662dfbb0b860f0bc70e09bc2c92dab831b (diff) | |
| download | mariadb-git-3d615e4b1aa4f945f69d310f9a19de80fbaccdca.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
Diffstat (limited to 'mysql-test/r/partition_column.result')
| -rw-r--r-- | mysql-test/r/partition_column.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/partition_column.result b/mysql-test/r/partition_column.result index 3df31078a50..cba1e283474 100644 --- a/mysql-test/r/partition_column.result +++ b/mysql-test/r/partition_column.result @@ -542,7 +542,7 @@ create table t1 as select to_seconds(null) as to_seconds; select data_type from information_schema.columns where table_schema='test' and column_name='to_seconds'; data_type -int +bigint drop table t1; create table t1 (a int, b int) partition by list columns(a,b) |