diff options
| author | unknown <iggy@recycle.(none)> | 2007-03-29 10:42:03 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-03-29 10:42:03 -0400 |
| commit | 1edf36853b8ce2c4a3e5a3b2676445baef60b50f (patch) | |
| tree | e03c95e78f3d23c4b7429b3b50374f9a08f7eea6 /mysql-test/r/udf.result | |
| parent | 9e6d54e4a5ddf0aae5b23a9b51507e7bb6b5d5f5 (diff) | |
| parent | 609277f942e5479976d5a1f31da55fd2cf646109 (diff) | |
| download | mariadb-git-1edf36853b8ce2c4a3e5a3b2676445baef60b50f.tar.gz | |
Merge recycle.(none):/src/bug23491/my50-bug23491
into recycle.(none):/src/bug23491/my51-bug23491
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
mysql-test/r/mysqldump.result:
Manual Merge.
sql/sql_yacc.yy:
Manual Merge.
Diffstat (limited to 'mysql-test/r/udf.result')
| -rw-r--r-- | mysql-test/r/udf.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index 593ac63ca80..c7a9b0982a9 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -159,7 +159,7 @@ EXPLAIN EXTENDED SELECT myfunc_int(fn(MIN(b))) as c FROM t1 GROUP BY a; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary; Using filesort Warnings: -Note 1003 select myfunc_int(`test`.`fn`(min(`test`.`t1`.`b`)) AS `fn(MIN(b))`) AS `c` from `test`.`t1` group by `test`.`t1`.`a` +Note 1003 select myfunc_int(`fn`(min(`test`.`t1`.`b`)) AS `fn(MIN(b))`) AS `c` from `test`.`t1` group by `test`.`t1`.`a` EXPLAIN EXTENDED SELECT myfunc_int(test.fn(MIN(b))) as c FROM t1 GROUP BY a; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary; Using filesort |