diff options
| author | unknown <igor@olga.mysql.com> | 2007-04-03 17:09:41 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-04-03 17:09:41 -0700 |
| commit | da037917b22ad522062ddcb15f96bc6249084fd3 (patch) | |
| tree | e8f6a5a08f4ae0f09bce192f3fe8f931377264a4 /mysql-test | |
| parent | 5fb897012996bf1c44eca5998fc06d235db83c45 (diff) | |
| download | mariadb-git-da037917b22ad522062ddcb15f96bc6249084fd3.tar.gz | |
Fix after manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/order_by.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 918a6b2e3d1..5eeb9bd6190 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -963,8 +963,8 @@ x1 x2 3 4 1 -2 -DROP TABLE t1; +2 +DROP TABLE t1; create table t1 (a int not null, b int not null, c int not null); insert t1 values (1,1,1),(1,1,2),(1,2,1); select a, b from t1 group by a, b order by sum(c); |