diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
| commit | 2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch) | |
| tree | c0a9a318a055f87e13206656d7765f96d3293d9f /mysql-test/r/olap.result | |
| parent | 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff) | |
| download | mariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz | |
after merge changes:
* rename all debugging related command-line options
and variables to start from "debug-", and made them all
OFF by default.
* replace "MySQL" with "MariaDB" in error messages
* "Cast ... converted ... integer to it's ... complement"
is now a note, not a warning
* @@query_cache_strip_comments now has a session scope,
not global.
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 8fb6f787795..b10f175b63e 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -255,11 +255,11 @@ concat(':',product,':') sum(profit) avg(profit) :TV: 600 120.00000 NULL 7785 519.00000 select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' explain select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' select product, country_id , year, sum(profit) from t1 group by product, country_id, year with cube union all select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup; -ERROR 42000: This version of MySQL doesn't yet support 'CUBE' +ERROR 42000: This version of MariaDB doesn't yet support 'CUBE' drop table t1,t2; CREATE TABLE t1 (i int); INSERT INTO t1 VALUES(100); |