diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-12-02 14:17:04 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-12-02 14:17:04 +0200 |
| commit | b79b6c357d1c4a1f952ff5b97580e9ca01bf8ec9 (patch) | |
| tree | 53d8c9dd70189d9f9c72f04bc0a5f0ce9a19fb5d /mysql-test/r/group_by.result | |
| parent | e462abe648cb4a44eac1956b2e5fc0d2ce992d04 (diff) | |
| parent | e3cecfd10c8006c6a9dabbb149225adbf5ce4deb (diff) | |
| download | mariadb-git-b79b6c357d1c4a1f952ff5b97580e9ca01bf8ec9.tar.gz | |
Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23
mysql-test/r/group_by.result:
Auto merged
mysql-test/t/group_by.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
Diffstat (limited to 'mysql-test/r/group_by.result')
| -rw-r--r-- | mysql-test/r/group_by.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 7b104996769..0b720bc3d97 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -96,3 +96,9 @@ xID xID1 Level 2 2 ** 3 134 *** 4 185 **** +pid c1id c2id value id active id active +1 1 NULL 1 1 Yes NULL NULL +1 NULL 3 3 NULL NULL 3 Yes +1 4 NULL 4 4 Yes NULL NULL +max(value) +4 |