diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-16 22:39:43 -0700 |
| commit | 704f97035fed1a454ea3300d2ad5dda906dbce50 (patch) | |
| tree | 7204d0246b026782b99b8effe9a0ec682e90e209 /mysql-test/r/func_str.result | |
| parent | 7b797fe66d7167a8f5cbb071a06a640a627f2186 (diff) | |
| parent | a8be09a9f26b43139ad84ead314898d23394f673 (diff) | |
| download | mariadb-git-704f97035fed1a454ea3300d2ad5dda906dbce50.tar.gz | |
Merged the code of MWL#106 into 5.3
Resolved all conflicts, bad merges and fixed a few minor bugs in the code.
Commented out the queries from multi_update, view, subselect_sj, func_str,
derived_view, view_grant that failed either with crashes in ps-protocol or
with wrong results.
The failures are clear indications of some bugs in the code and these bugs
are to be fixed.
Diffstat (limited to 'mysql-test/r/func_str.result')
| -rw-r--r-- | mysql-test/r/func_str.result | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index bbfd3880d2e..bd7681c7bfd 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -2395,18 +2395,6 @@ C 4194326291 2366072709 2707236321 -SELECT * FROM (SELECT * FROM v1) x; -C -2212294583 -450215437 -1842515611 -4088798008 -2226203566 -498629140 -1790921346 -4194326291 -2366072709 -2707236321 DROP TABLE t1, t2; DROP VIEW v1; SELECT LOCATE('foo', NULL) FROM DUAL; @@ -2549,14 +2537,12 @@ create table t1(f1 tinyint default null)engine=myisam; insert into t1 values (-1),(null); explain select 1 as a from t1,(select decode(f1,f1) as b from t1) a; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 -1 PRIMARY <derived2> ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) -2 DERIVED t1 ALL NULL NULL NULL NULL 2 +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) explain select 1 as a from t1,(select encode(f1,f1) as b from t1) a; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 -1 PRIMARY <derived2> ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) -2 DERIVED t1 ALL NULL NULL NULL NULL 2 +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 +1 SIMPLE t1 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) drop table t1; # # Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0 |