diff options
| author | unknown <evgen@moonbone.local> | 2007-05-30 19:35:35 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-05-30 19:35:35 +0400 |
| commit | 937d5f8966005abd6540817f51cd87429be4c11c (patch) | |
| tree | 9cc17888a2b22fe163b087455d74766f17c0a8aa /mysql-test/r/olap.result | |
| parent | d9426a89e45f7211a6b6529c09739972fe0b7914 (diff) | |
| parent | 98b5043a3dfa0faca87a63f72d804beb00789eae (diff) | |
| download | mariadb-git-937d5f8966005abd6540817f51cd87429be4c11c.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/olap.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/analyse.result:
Manual merge
mysql-test/r/sp.result:
Manual merge
sql/item_timefunc.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index f5544b4d115..67c45b698ce 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -696,8 +696,8 @@ CREATE VIEW v1 AS SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP; DESC v1; Field Type Null Key Default Extra -a int(11) YES 0 -LENGTH(a) int(10) YES NULL +a bigint(11) YES NULL +LENGTH(a) bigint(10) YES NULL COUNT(*) bigint(21) NO 0 SELECT * FROM v1; a LENGTH(a) COUNT(*) |