- developers - lists.mariadb.org

Re: [Maria-developers] Please review: [Commits] Rev 3406: Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, inner joins takes hundreds times longer in file:///home/tsk/mprog/src/5.5-lpb944706/
by Sergei Petrunia 14 Jun '12

14 Jun '12

Hi Timour, Ok to push. I was wondering what are your plans with regards to pushing 5.5-timour to main? Is this the last issue? On Wed, May 30, 2012 at 12:22:06AM +0300, Timour Katchaounov wrote: > Sergey, > > Please review the following bug fix that we discussed today. > > > Timour > > > ------------------------------------------------------------ > revno: 3406 > revision-id: timour(a)askmonty.org-20120529211853-hww47vl7d4u4ae23 > parent: timour(a)askmonty.org-20120524110828-r0mm8sm1vn8a095e > committer: timour(a)askmonty.org > branch nick: 5.5-lpb944706 > timestamp: Wed 2012-05-30 00:18:53 +0300 > message: > Patch for mdev-287: CHEAP SQ: A query with subquery in SELECT list, EXISTS, inner joins takes hundreds times longer > > Analysis: > > The fix for lp:944706 introduces early subquery optimization. > While a subquery is being optimized some of its predicates may be > removed. In the test case, the EXISTS subquery is constant, and is > evaluated to TRUE. As a result the whole OR is TRUE, and thus the > correlated condition "b = alias1.b" is optimized away. The subquery > becomes non-correlated. > > The subquery cache is designed to work only for correlated subqueries. > If constant subquery optimization is disallowed, then the constant > subquery is not evaluated, the subquery remains correlated, and its > execution is cached. As a result execution is fast. > > However, when the constant subquery was optimized away, it was neither > cached by the subquery cache, nor it was cached by the internal subquery > caching. The latter was due to the fact that the subquery still appeared > as correlated to the subselect_XYZ_engine::exec methods, and they > re-executed the subquery on each call to Item_subselect::exec. > > Solution: > > The solution is to update the correlated status of the subquery after it has > been optimized. This status consists of: > - st_select_lex::is_correlated > - Item_subselect::is_correlated > - SELECT_LEX::uncacheable > - SELECT_LEX_UNIT::uncacheable > The status is updated by st_select_lex::update_correlated_cache(), and its > caller st_select_lex::optimize_unflattened_subqueries. The solution relies > on the fact that the optimizer already called > st_select_lex::update_used_tables() for each subquery. This allows to > efficiently update the correlated status of each subquery without walking > the whole subquery tree. > > Notice that his patch is an improvement over MySQL 5.6 and older, where > subqueries are not pre-optimized, and the above analysis is not possible. > === modified file 'mysql-test/r/derived_opt.result' > --- a/mysql-test/r/derived_opt.result 2012-02-14 14:52:56 +0000 > +++ b/mysql-test/r/derived_opt.result 2012-05-29 21:18:53 +0000 > @@ -161,24 +161,24 @@ prepare stmt1 from @stmt ; > execute stmt1 ; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > execute stmt1 ; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > explain SELECT (SELECT SUM(c1 + c12 + 0.0) FROM t2 where (t1.c2 - 0e-3) = t2.c2 GROUP BY t1.c15 LIMIT 1) as scalar_s, exists (select 1.0e+0 from t2 where t2.c3 * 9.0000000000 = t1.c4) as exists_s, c5 * 4 in (select c6 + 0.3e+1 from t2) as in_s, (c7 - 4, c8 - 4) in (select c9 + 4.0, c10 + 40e-1 from t2) as in_row_s FROM t1, (select c25 x, c32 y from t2) tt WHERE x * 1 = c25; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > deallocate prepare stmt1; > drop tables t1,t2; > set @@optimizer_switch=@save_optimizer_switch; > > === modified file 'mysql-test/r/explain.result' > --- a/mysql-test/r/explain.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/explain.result 2012-05-29 21:18:53 +0000 > @@ -225,10 +225,10 @@ INSERT INTO t2 VALUES (NULL), (0); > EXPLAIN EXTENDED SELECT (SELECT 1 FROM t2 WHERE d = c) FROM t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select <expr_cache><NULL>((select 1 from `test`.`t2` where (`test`.`t2`.`d` = NULL))) AS `(SELECT 1 FROM t2 WHERE d = c)` from dual > +Note 1003 select (select 1 from `test`.`t2` where (`test`.`t2`.`d` = NULL)) AS `(SELECT 1 FROM t2 WHERE d = c)` from dual > DROP TABLE t1, t2; > # > # Bug#30302: Tables that were optimized away are printed in the > > === modified file 'mysql-test/r/index_merge_innodb.result' > --- a/mysql-test/r/index_merge_innodb.result 2012-02-21 19:51:56 +0000 > +++ b/mysql-test/r/index_merge_innodb.result 2012-05-29 21:18:53 +0000 > @@ -654,7 +654,7 @@ EXPLAIN SELECT t1.f1 FROM t1 > WHERE (SELECT COUNT(*) FROM t2 WHERE t2.f3 = 'h' AND t2.f2 = t1.f1) = 0 AND t1.f1 = 2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1 Using index > -2 DEPENDENT SUBQUERY t2 index_merge f2,f3 f3,f2 2,5 NULL 1 Using intersect(f3,f2); Using where; Using index > +2 SUBQUERY t2 index_merge f2,f3 f3,f2 2,5 NULL 1 Using intersect(f3,f2); Using where; Using index > DROP TABLE t1,t2; > # > # BUG#56862/640419: Wrong result with sort_union index merge when one > > === modified file 'mysql-test/r/index_merge_myisam.result' > --- a/mysql-test/r/index_merge_myisam.result 2012-02-15 17:08:08 +0000 > +++ b/mysql-test/r/index_merge_myisam.result 2012-05-29 21:18:53 +0000 > @@ -1487,7 +1487,7 @@ EXPLAIN SELECT t1.f1 FROM t1 > WHERE (SELECT COUNT(*) FROM t2 WHERE t2.f3 = 'h' AND t2.f2 = t1.f1) = 0 AND t1.f1 = 2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t2 ref f2,f3 f2 5 const 1 Using where > +2 SUBQUERY t2 ref f2,f3 f2 5 const 1 Using where > DROP TABLE t1,t2; > create table t0 (a int); > insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); > > === modified file 'mysql-test/r/join_outer.result' > --- a/mysql-test/r/join_outer.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/join_outer.result 2012-05-29 21:18:53 +0000 > @@ -1872,7 +1872,7 @@ SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > 1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > Note 1003 select NULL AS `a` from `test`.`t2` where 1 > DROP TABLE t1,t2,t3; > > === modified file 'mysql-test/r/join_outer_jcl6.result' > --- a/mysql-test/r/join_outer_jcl6.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/join_outer_jcl6.result 2012-05-29 21:18:53 +0000 > @@ -1883,7 +1883,7 @@ SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > 1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > Note 1003 select NULL AS `a` from `test`.`t2` where 1 > DROP TABLE t1,t2,t3; > > === modified file 'mysql-test/r/ps.result' > --- a/mysql-test/r/ps.result 2012-04-10 06:28:13 +0000 > +++ b/mysql-test/r/ps.result 2012-05-29 21:18:53 +0000 > @@ -160,26 +160,26 @@ execute stmt1 ; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > execute stmt1 ; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > explain SELECT (SELECT SUM(c1 + c12 + 0.0) FROM t2 where (t1.c2 - 0e-3) = t2.c2 GROUP BY t1.c15 LIMIT 1) as scalar_s, exists (select 1.0e+0 from t2 where t2.c3 * 9.0000000000 = t1.c4) as exists_s, c5 * 4 in (select c6 + 0.3e+1 from t2) as in_s, (c7 - 4, c8 - 4) in (select c9 + 4.0, c10 + 40e-1 from t2) as in_row_s FROM t1, (select c25 x, c32 y from t2) tt WHERE x * 1 = c25; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 6 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > -5 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -4 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +5 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +4 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > deallocate prepare stmt1; > set optimizer_switch=@tmp_optimizer_switch; > drop tables t1,t2; > > === modified file 'mysql-test/r/subselect.result' > --- a/mysql-test/r/subselect.result 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/r/subselect.result 2012-05-29 21:18:53 +0000 > @@ -51,12 +51,12 @@ ERROR 42S22: Reference 'a' not supported > EXPLAIN EXTENDED SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 100.00 > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > 2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > -Note 1003 select 1 AS `1` from dual having (<expr_cache><1>((select 1)) = 1) > +Note 1003 select 1 AS `1` from dual having ((select 1) = 1) > SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > 1 > 1 > @@ -904,7 +904,7 @@ a t1.a in (select t2.a from t2) > explain extended SELECT t1.a, t1.a in (select t2.a from t2) FROM t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL PRIMARY 4 NULL 4 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > +2 SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > Warnings: > Note 1003 select `test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`) in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`))))) AS `t1.a in (select t2.a from t2)` from `test`.`t1` > CREATE TABLE t3 (a int(11) default '0'); > @@ -1317,7 +1317,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > INSERT INTO t1 (pseudo) VALUES ('test1'); > @@ -1327,7 +1327,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > drop table t1; > @@ -1605,25 +1605,25 @@ a3 1 > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))) AS `s1 = ANY (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 <> ALL (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1` > drop table t1,t2; > @@ -3097,7 +3097,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > @@ -3109,7 +3109,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > @@ -3160,7 +3160,7 @@ INSERT INTO t2 VALUES (1),(2),(3); > EXPLAIN SELECT a, a IN (SELECT a FROM t1) FROM t2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 3 > -2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > +2 SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > SELECT a, a IN (SELECT a FROM t1) FROM t2; > a a IN (SELECT a FROM t1) > 1 1 > @@ -3696,7 +3696,7 @@ ORDER BY t1.t DESC LIMIT 1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > 1 PRIMARY t1 index NULL PRIMARY 16 NULL 11 Using where; Using index > -2 DEPENDENT SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > +2 SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > SELECT * FROM t1,t2 > WHERE t1.t = (SELECT t1.t FROM t1 > WHERE t1.t < t2.t AND t1.i2=1 AND t2.i1=t1.i1 > @@ -4577,7 +4577,7 @@ FROM t1 > WHERE a = 230; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b) > FROM t1 > WHERE a = 230; > @@ -5713,7 +5713,7 @@ WHERE ('0') IN ( SELECT a FROM t1 GROUP > GROUP BY b; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > SELECT b FROM t1 > WHERE ('0') IN ( SELECT a FROM t1 GROUP BY a ) > GROUP BY b; > @@ -6530,7 +6530,7 @@ EXPLAIN > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 NULL > @@ -6538,7 +6538,7 @@ EXPLAIN > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 0 > @@ -6573,7 +6573,7 @@ WHERE alias1.a = alias2.a OR alias1.a = > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > @@ -6587,7 +6587,7 @@ id select_type table type possible_keys > 1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > 1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > @@ -6615,5 +6615,90 @@ SELECT * FROM t1 > WHERE a1 = (SELECT COUNT(*) FROM t1 WHERE a1 IN (SELECT a1 FROM t1, t2)); > a1 > drop table t1, t2; > +# > +# MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +# inner joins takes hundreds times longer > +# > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > +set @@expensive_subquery_limit= 0; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 6 > +Subquery_cache_miss 2 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 8 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 22 > +set @@expensive_subquery_limit= default; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 16 > +drop table t1, t2, t3; > # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > > === modified file 'mysql-test/r/subselect4.result' > --- a/mysql-test/r/subselect4.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/subselect4.result 2012-05-29 21:18:53 +0000 > @@ -226,10 +226,10 @@ NULL > EXPLAIN EXTENDED SELECT (SELECT 1 FROM t2 WHERE d = c) AS RESULT FROM t1 ; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select <expr_cache><>((select 1 from `test`.`t2` where 0)) AS `RESULT` from dual > +Note 1003 select (select 1 from `test`.`t2` where 0) AS `RESULT` from dual > first equivalent variant > SELECT (SELECT 1 FROM t2 WHERE d = IFNULL(c,NULL)) AS RESULT FROM t1 GROUP BY c ; > RESULT > @@ -237,10 +237,10 @@ NULL > EXPLAIN EXTENDED SELECT (SELECT 1 FROM t2 WHERE d = IFNULL(c,NULL)) AS RESULT FROM t1 GROUP BY c; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select <expr_cache><>((select 1 from `test`.`t2` where 0)) AS `RESULT` from dual group by NULL > +Note 1003 select (select 1 from `test`.`t2` where 0) AS `RESULT` from dual group by NULL > second equivalent variant > SELECT (SELECT 1 FROM t2 WHERE d = c) AS RESULT FROM t1 GROUP BY c ; > RESULT > @@ -248,10 +248,10 @@ NULL > EXPLAIN EXTENDED SELECT (SELECT 1 FROM t2 WHERE d = c) AS RESULT FROM t1 GROUP BY c ; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1276 Field or reference 'test.t1.c' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select <expr_cache><>((select 1 from `test`.`t2` where 0)) AS `RESULT` from dual group by NULL > +Note 1003 select (select 1 from `test`.`t2` where 0) AS `RESULT` from dual group by NULL > DROP TABLE t1,t2; > # > # BUG#45928 "Differing query results depending on MRR and > @@ -649,7 +649,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in; > not_in > NULL > @@ -671,7 +671,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in; > not_in > NULL > @@ -679,7 +679,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in; > not_in > 1 > @@ -687,7 +687,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in; > not_in > NULL > @@ -695,7 +695,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in; > not_in > NULL > @@ -703,7 +703,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in; > not_in > NULL > @@ -719,28 +719,28 @@ EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2); > f1 f2 > EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2) as not_in; > not_in > NULL > @@ -748,21 +748,21 @@ EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2); > f1 f2 > EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2) as not_in; > not_in > NULL > @@ -770,7 +770,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) > 7) as not_in; > not_in > 1 > @@ -778,7 +778,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 HAVING max(f4) is null) as not_in; > not_in > NULL > @@ -786,7 +786,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2) as not_in; > not_in > NULL > @@ -794,7 +794,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2) as not_in; > not_in > NULL > @@ -835,7 +835,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -857,7 +857,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -865,7 +865,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in; > not_in > 1 > @@ -873,7 +873,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in; > not_in > NULL > @@ -881,7 +881,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -889,7 +889,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -905,28 +905,28 @@ EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2 WHERE f3 > 10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3+f4, min(f4) FROM t2 WHERE f3 > 10); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2 WHERE f3 > 10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, min(f4)+max(f4) FROM t2 WHERE f3 > 10); > f1 f2 > EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, min(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -934,21 +934,21 @@ EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10); > f1 f2 > EXPLAIN > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2 WHERE f3 > 10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT f3, f3 + count(f4) FROM t2 WHERE f3 > 10); > f1 f2 > EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -956,7 +956,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) > 7) as not_in; > not_in > 1 > @@ -964,7 +964,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT f3, count(f4) FROM t2 WHERE f3 > 10 HAVING max(f4) is null) as not_in; > not_in > NULL > @@ -972,7 +972,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4) FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -980,7 +980,7 @@ EXPLAIN > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > +2 SUBQUERY t2 range PRIMARY PRIMARY 4 NULL 1 Using index condition; Rowid-ordered scan > SELECT (2, 0) NOT IN (SELECT max(f3+f3), count(f4)+f3 FROM t2 WHERE f3 > 10) as not_in; > not_in > NULL > @@ -1240,7 +1240,7 @@ EXPLAIN > SELECT i FROM t1 WHERE (1) NOT IN (SELECT i FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t2 index_subquery k k 5 const 2 Using index > +2 SUBQUERY t2 index_subquery k k 5 const 2 Using index > DROP TABLE t2; > DROP TABLE t1; > # > @@ -1258,8 +1258,8 @@ WHERE ('v') IN (SELECT f4 FROM t2) > GROUP BY f9; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > (SELECT COUNT(f3) FROM t1 WHERE t2.f1) AS f9 > FROM t2 JOIN t1 ON t1.f3 > @@ -1274,8 +1274,8 @@ WHERE ('v') IN (SELECT f4 FROM t2) > ORDER BY f9; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > (SELECT COUNT(f3) FROM t1 WHERE t2.f1) AS f9 > FROM t2 JOIN t1 ON t1.f3 > @@ -1291,8 +1291,8 @@ WHERE ('v') IN (SELECT f4 FROM t2) > GROUP BY f9; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > (SELECT t2.f1 FROM t1 limit 1) AS f9 > FROM t2 JOIN t1 > @@ -1307,8 +1307,8 @@ WHERE ('v') IN (SELECT f4 FROM t2) > ORDER BY f9; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > (SELECT t2.f1 FROM t1 limit 1) AS f9 > FROM t2 JOIN t1 > @@ -1390,7 +1390,7 @@ EXPLAIN > SELECT 'bug' FROM DUAL WHERE ( 5 ) IN ( SELECT * FROM v1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used > 4 UNION NULL NULL NULL NULL NULL NULL NULL No tables used > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1400,7 +1400,7 @@ EXPLAIN > SELECT ( 5 ) IN ( SELECT * FROM v1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used > 4 UNION NULL NULL NULL NULL NULL NULL NULL No tables used > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1411,7 +1411,7 @@ EXPLAIN > SELECT 'bug' FROM DUAL WHERE ( 5 ) IN (SELECT * FROM v2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED t1 system NULL NULL NULL NULL 1 > 4 UNION t2 system NULL NULL NULL NULL 1 > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1431,7 +1431,7 @@ EXPLAIN > SELECT ( 5 ) IN ( SELECT * FROM v2 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED t1 system NULL NULL NULL NULL 1 > 4 UNION t2 system NULL NULL NULL NULL 1 > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1443,7 +1443,7 @@ EXPLAIN > SELECT 'bug' FROM DUAL WHERE ( 5 ) IN ( SELECT * FROM v1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used > 4 UNION NULL NULL NULL NULL NULL NULL NULL No tables used > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1453,7 +1453,7 @@ EXPLAIN > SELECT ( 5 ) IN ( SELECT * FROM v1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED NULL NULL NULL NULL NULL NULL NULL No tables used > 4 UNION NULL NULL NULL NULL NULL NULL NULL No tables used > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1464,7 +1464,7 @@ EXPLAIN > SELECT 'bug' FROM DUAL WHERE ( 5 ) IN (SELECT * FROM v2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED t1 system NULL NULL NULL NULL 1 > 4 UNION t2 system NULL NULL NULL NULL 1 > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1474,7 +1474,7 @@ EXPLAIN > SELECT 'bug' FROM t3 WHERE ( 5 ) IN (SELECT * FROM v2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t3 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED t1 system NULL NULL NULL NULL 1 > 4 UNION t2 system NULL NULL NULL NULL 1 > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1484,7 +1484,7 @@ EXPLAIN > SELECT ( 5 ) IN ( SELECT * FROM v2 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY <derived3> ALL NULL NULL NULL NULL 2 Using where > 3 DERIVED t1 system NULL NULL NULL NULL 1 > 4 UNION t2 system NULL NULL NULL NULL 1 > NULL UNION RESULT <union3,4> ALL NULL NULL NULL NULL NULL > @@ -1635,8 +1635,8 @@ EXPLAIN > SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > -2 DEPENDENT SUBQUERY t3 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t2 ref_or_null f10 f10 10 const,const 2 Using where; Using index > +2 SUBQUERY t3 system NULL NULL NULL NULL 1 > +2 SUBQUERY t2 ref_or_null f10 f10 10 const,const 2 Using where; Using index > SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10); > f4 > drop table t1,t2,t3; > > === modified file 'mysql-test/r/subselect_extra_no_semijoin.result' > --- a/mysql-test/r/subselect_extra_no_semijoin.result 2012-01-13 14:50:02 +0000 > +++ b/mysql-test/r/subselect_extra_no_semijoin.result 2012-05-29 21:18:53 +0000 > @@ -46,7 +46,7 @@ select * from t1 > where id in (select id from t1 as x1 where (t1.cur_date is null)); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > Warnings: > Note 1276 Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1 > Note 1003 select 1 AS `id`,'2007-04-25 18:30:22' AS `cur_date` from dual where <expr_cache><1>(<in_optimizer>(1,<exists>(select `test`.`x1`.`id` from `test`.`t1` `x1` where 0))) > @@ -58,7 +58,7 @@ select * from t2 > where id in (select id from t2 as x1 where (t2.cur_date is null)); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > Warnings: > Note 1276 Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1 > Note 1003 select 1 AS `id`,'2007-04-25' AS `cur_date` from dual where <expr_cache><1>(<in_optimizer>(1,<exists>(select `test`.`x1`.`id` from `test`.`t2` `x1` where 0))) > > === modified file 'mysql-test/r/subselect_mat.result' > --- a/mysql-test/r/subselect_mat.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/subselect_mat.result 2012-05-29 21:18:53 +0000 > @@ -1163,7 +1163,7 @@ set @@optimizer_switch='materialization= > explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > min(a1) > NULL > @@ -1182,7 +1182,7 @@ set @@optimizer_switch='materialization= > explain select min(a1) from t1 where 7 in (select b1 from t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2); > min(a1) > NULL > @@ -1190,7 +1190,7 @@ NULL > explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > min(a1) > NULL > @@ -2162,7 +2162,7 @@ EXPLAIN > SELECT (SELECT f3a FROM t3) NOT IN (SELECT f1a FROM t1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -3 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +3 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT (SELECT f3a FROM t3) NOT IN (SELECT f1a FROM t1); > (SELECT f3a FROM t3) NOT IN (SELECT f1a FROM t1) > @@ -2179,7 +2179,7 @@ EXPLAIN > SELECT (SELECT f3a, f3b FROM t3) NOT IN (SELECT f1a, f1b FROM t1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used > -3 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +3 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT (SELECT f3a, f3b FROM t3) NOT IN (SELECT f1a, f1b FROM t1); > (SELECT f3a, f3b FROM t3) NOT IN (SELECT f1a, f1b FROM t1) > @@ -2234,7 +2234,7 @@ EXPLAIN EXTENDED > SELECT MAX(t1.b) AS max_res FROM t1 WHERE (9) IN (SELECT a FROM t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > -2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > Note 1003 select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where 0 > DROP TABLE t1,t2; > > === modified file 'mysql-test/r/subselect_mat_cost.result' > --- a/mysql-test/r/subselect_mat_cost.result 2012-03-01 22:22:22 +0000 > +++ b/mysql-test/r/subselect_mat_cost.result 2012-05-29 21:18:53 +0000 > @@ -496,7 +496,7 @@ from City > where City.population > 10000000; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY City range Population Population 5 NULL 4 Using index condition; Rowid-ordered scan > -2 DEPENDENT SUBQUERY Country index_subquery CountryCapital CountryCapital 5 func 2 Using index; Using where > +2 SUBQUERY Country index_subquery CountryCapital CountryCapital 5 func 2 Using index; Using where > select Name, City.id in (select capital from Country where capital is not null) as is_capital > from City > where City.population > 10000000; > > === modified file 'mysql-test/r/subselect_mat_cost_bugs.result' > --- a/mysql-test/r/subselect_mat_cost_bugs.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/subselect_mat_cost_bugs.result 2012-05-29 21:18:53 +0000 > @@ -124,7 +124,7 @@ FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1 > WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT t1.* > FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1 > WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 ); > > === modified file 'mysql-test/r/subselect_no_mat.result' > --- a/mysql-test/r/subselect_no_mat.result 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/r/subselect_no_mat.result 2012-05-29 21:18:53 +0000 > @@ -58,12 +58,12 @@ ERROR 42S22: Reference 'a' not supported > EXPLAIN EXTENDED SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 100.00 > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > 2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > -Note 1003 select 1 AS `1` from dual having (<expr_cache><1>((select 1)) = 1) > +Note 1003 select 1 AS `1` from dual having ((select 1) = 1) > SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > 1 > 1 > @@ -911,7 +911,7 @@ a t1.a in (select t2.a from t2) > explain extended SELECT t1.a, t1.a in (select t2.a from t2) FROM t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL PRIMARY 4 NULL 4 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > +2 SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > Warnings: > Note 1003 select `test`.`t1`.`a` AS `a`,<expr_cache><`test`.`t1`.`a`>(<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`) in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`))))) AS `t1.a in (select t2.a from t2)` from `test`.`t1` > CREATE TABLE t3 (a int(11) default '0'); > @@ -1324,7 +1324,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > INSERT INTO t1 (pseudo) VALUES ('test1'); > @@ -1334,7 +1334,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > drop table t1; > @@ -1612,25 +1612,25 @@ a3 1 > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))) AS `s1 = ANY (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 <> ALL (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<expr_cache><`test`.`t1`.`s1`>(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having trigcond(<is_not_null_test>(`test`.`t2`.`s1`)))))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1` > drop table t1,t2; > @@ -3103,7 +3103,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > @@ -3115,7 +3115,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > @@ -3166,7 +3166,7 @@ INSERT INTO t2 VALUES (1),(2),(3); > EXPLAIN SELECT a, a IN (SELECT a FROM t1) FROM t2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 3 > -2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > +2 SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > SELECT a, a IN (SELECT a FROM t1) FROM t2; > a a IN (SELECT a FROM t1) > 1 1 > @@ -3700,7 +3700,7 @@ ORDER BY t1.t DESC LIMIT 1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > 1 PRIMARY t1 index NULL PRIMARY 16 NULL 11 Using where; Using index > -2 DEPENDENT SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > +2 SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > SELECT * FROM t1,t2 > WHERE t1.t = (SELECT t1.t FROM t1 > WHERE t1.t < t2.t AND t1.i2=1 AND t2.i1=t1.i1 > @@ -4526,13 +4526,13 @@ SET join_cache_level=0; > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > @@ -4579,7 +4579,7 @@ FROM t1 > WHERE a = 230; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b) > FROM t1 > WHERE a = 230; > @@ -5714,7 +5714,7 @@ WHERE ('0') IN ( SELECT a FROM t1 GROUP > GROUP BY b; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > SELECT b FROM t1 > WHERE ('0') IN ( SELECT a FROM t1 GROUP BY a ) > GROUP BY b; > @@ -6529,7 +6529,7 @@ EXPLAIN > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 NULL > @@ -6537,7 +6537,7 @@ EXPLAIN > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 0 > @@ -6572,7 +6572,7 @@ WHERE alias1.a = alias2.a OR alias1.a = > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > @@ -6586,7 +6586,7 @@ id select_type table type possible_keys > 1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > 1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > @@ -6613,6 +6613,91 @@ SELECT * FROM t1 > WHERE a1 = (SELECT COUNT(*) FROM t1 WHERE a1 IN (SELECT a1 FROM t1, t2)); > a1 > drop table t1, t2; > +# > +# MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +# inner joins takes hundreds times longer > +# > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > +set @@expensive_subquery_limit= 0; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 6 > +Subquery_cache_miss 2 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 8 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 22 > +set @@expensive_subquery_limit= default; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 16 > +drop table t1, t2, t3; > # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > > === modified file 'mysql-test/r/subselect_no_opts.result' > --- a/mysql-test/r/subselect_no_opts.result 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/r/subselect_no_opts.result 2012-05-29 21:18:53 +0000 > @@ -54,7 +54,7 @@ ERROR 42S22: Reference 'a' not supported > EXPLAIN EXTENDED SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 100.00 > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > 2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > @@ -907,7 +907,7 @@ a t1.a in (select t2.a from t2) > explain extended SELECT t1.a, t1.a in (select t2.a from t2) FROM t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL PRIMARY 4 NULL 4 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > +2 SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > Warnings: > Note 1003 select `test`.`t1`.`a` AS `a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`) in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`)))) AS `t1.a in (select t2.a from t2)` from `test`.`t1` > CREATE TABLE t3 (a int(11) default '0'); > @@ -1320,7 +1320,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > INSERT INTO t1 (pseudo) VALUES ('test1'); > @@ -1330,7 +1330,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > drop table t1; > @@ -1608,25 +1608,25 @@ a3 1 > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))) AS `s1 = ANY (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 <> ALL (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1` > drop table t1,t2; > @@ -3099,7 +3099,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > @@ -3111,7 +3111,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > @@ -3162,7 +3162,7 @@ INSERT INTO t2 VALUES (1),(2),(3); > EXPLAIN SELECT a, a IN (SELECT a FROM t1) FROM t2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 3 > -2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > +2 SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > SELECT a, a IN (SELECT a FROM t1) FROM t2; > a a IN (SELECT a FROM t1) > 1 1 > @@ -3696,7 +3696,7 @@ ORDER BY t1.t DESC LIMIT 1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > 1 PRIMARY t1 index NULL PRIMARY 16 NULL 11 Using where; Using index > -2 DEPENDENT SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > +2 SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > SELECT * FROM t1,t2 > WHERE t1.t = (SELECT t1.t FROM t1 > WHERE t1.t < t2.t AND t1.i2=1 AND t2.i1=t1.i1 > @@ -4522,13 +4522,13 @@ SET join_cache_level=0; > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > @@ -4575,7 +4575,7 @@ FROM t1 > WHERE a = 230; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b) > FROM t1 > WHERE a = 230; > @@ -5710,7 +5710,7 @@ WHERE ('0') IN ( SELECT a FROM t1 GROUP > GROUP BY b; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > SELECT b FROM t1 > WHERE ('0') IN ( SELECT a FROM t1 GROUP BY a ) > GROUP BY b; > @@ -6525,7 +6525,7 @@ EXPLAIN > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 NULL > @@ -6533,7 +6533,7 @@ EXPLAIN > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 0 > @@ -6568,7 +6568,7 @@ WHERE alias1.a = alias2.a OR alias1.a = > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > @@ -6582,7 +6582,7 @@ id select_type table type possible_keys > 1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > 1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > @@ -6610,6 +6610,91 @@ SELECT * FROM t1 > WHERE a1 = (SELECT COUNT(*) FROM t1 WHERE a1 IN (SELECT a1 FROM t1, t2)); > a1 > drop table t1, t2; > +# > +# MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +# inner joins takes hundreds times longer > +# > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > +set @@expensive_subquery_limit= 0; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 6 > +Subquery_cache_miss 2 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 8 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 22 > +set @@expensive_subquery_limit= default; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 16 > +drop table t1, t2, t3; > # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/r/subselect_no_scache.result' > --- a/mysql-test/r/subselect_no_scache.result 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/r/subselect_no_scache.result 2012-05-29 21:18:53 +0000 > @@ -57,7 +57,7 @@ ERROR 42S22: Reference 'a' not supported > EXPLAIN EXTENDED SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 100.00 > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > 2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > @@ -910,7 +910,7 @@ a t1.a in (select t2.a from t2) > explain extended SELECT t1.a, t1.a in (select t2.a from t2) FROM t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL PRIMARY 4 NULL 4 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > +2 SUBQUERY t2 index_subquery a a 5 func 2 100.00 Using index > Warnings: > Note 1003 select `test`.`t1`.`a` AS `a`,<in_optimizer>(`test`.`t1`.`a`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`a`) in t2 on a checking NULL having <is_not_null_test>(`test`.`t2`.`a`)))) AS `t1.a in (select t2.a from t2)` from `test`.`t1` > CREATE TABLE t3 (a int(11) default '0'); > @@ -1323,7 +1323,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > INSERT INTO t1 (pseudo) VALUES ('test1'); > @@ -1333,7 +1333,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > drop table t1; > @@ -1611,25 +1611,25 @@ a3 1 > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 = ANY (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))) AS `s1 = ANY (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 <> ALL (SELECT s1 FROM t2) from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 <> ALL (SELECT s1 FROM t2)` from `test`.`t1` > explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 index NULL s1 6 NULL 3 100.00 Using index > -2 DEPENDENT SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > +2 SUBQUERY t2 index_subquery s1 s1 6 func 2 100.00 Using index; Using where; Full scan on NULL key > Warnings: > Note 1003 select `test`.`t1`.`s1` AS `s1`,(not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < 'a2') having trigcond(<is_not_null_test>(`test`.`t2`.`s1`))))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1` > drop table t1,t2; > @@ -3103,7 +3103,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > @@ -3115,7 +3115,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > @@ -3166,7 +3166,7 @@ INSERT INTO t2 VALUES (1),(2),(3); > EXPLAIN SELECT a, a IN (SELECT a FROM t1) FROM t2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 3 > -2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > +2 SUBQUERY t1 index_subquery a a 5 func 2 Using index; Full scan on NULL key > SELECT a, a IN (SELECT a FROM t1) FROM t2; > a a IN (SELECT a FROM t1) > 1 1 > @@ -3702,7 +3702,7 @@ ORDER BY t1.t DESC LIMIT 1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > 1 PRIMARY t1 index NULL PRIMARY 16 NULL 11 Using where; Using index > -2 DEPENDENT SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > +2 SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > SELECT * FROM t1,t2 > WHERE t1.t = (SELECT t1.t FROM t1 > WHERE t1.t < t2.t AND t1.i2=1 AND t2.i1=t1.i1 > @@ -4583,7 +4583,7 @@ FROM t1 > WHERE a = 230; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b) > FROM t1 > WHERE a = 230; > @@ -5719,7 +5719,7 @@ WHERE ('0') IN ( SELECT a FROM t1 GROUP > GROUP BY b; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > SELECT b FROM t1 > WHERE ('0') IN ( SELECT a FROM t1 GROUP BY a ) > GROUP BY b; > @@ -6536,7 +6536,7 @@ EXPLAIN > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 NULL > @@ -6544,7 +6544,7 @@ EXPLAIN > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 0 > @@ -6579,7 +6579,7 @@ WHERE alias1.a = alias2.a OR alias1.a = > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > @@ -6593,7 +6593,7 @@ id select_type table type possible_keys > 1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > 1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > @@ -6621,6 +6621,91 @@ SELECT * FROM t1 > WHERE a1 = (SELECT COUNT(*) FROM t1 WHERE a1 IN (SELECT a1 FROM t1, t2)); > a1 > drop table t1, t2; > +# > +# MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +# inner joins takes hundreds times longer > +# > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > +set @@expensive_subquery_limit= 0; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 58 > +set @@expensive_subquery_limit= default; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 16 > +drop table t1, t2, t3; > # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > > === modified file 'mysql-test/r/subselect_no_semijoin.result' > --- a/mysql-test/r/subselect_no_semijoin.result 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/r/subselect_no_semijoin.result 2012-05-29 21:18:53 +0000 > @@ -54,12 +54,12 @@ ERROR 42S22: Reference 'a' not supported > EXPLAIN EXTENDED SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY <derived2> system NULL NULL NULL NULL 1 100.00 > -3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > +3 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > 2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL No tables used > Warnings: > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > Note 1276 Field or reference 'b.a' of SELECT #3 was resolved in SELECT #1 > -Note 1003 select 1 AS `1` from dual having (<expr_cache><1>((select 1)) = 1) > +Note 1003 select 1 AS `1` from dual having ((select 1) = 1) > SELECT 1 FROM (SELECT 1 as a) as b HAVING (SELECT a)=1; > 1 > 1 > @@ -1320,7 +1320,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > INSERT INTO t1 (pseudo) VALUES ('test1'); > @@ -1330,7 +1330,7 @@ SELECT 0 IN (SELECT 1 FROM t1 a); > EXPLAIN EXTENDED SELECT 0 IN (SELECT 1 FROM t1 a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Note 1003 select <in_optimizer>(0,<exists>(select 1 from `test`.`t1` `a` where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)` > drop table t1; > @@ -3099,7 +3099,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > @@ -3111,7 +3111,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > 1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > -2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > +2 SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > @@ -3696,7 +3696,7 @@ ORDER BY t1.t DESC LIMIT 1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > 1 PRIMARY t1 index NULL PRIMARY 16 NULL 11 Using where; Using index > -2 DEPENDENT SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > +2 SUBQUERY t1 range PRIMARY PRIMARY 16 NULL 5 Using where; Using index > SELECT * FROM t1,t2 > WHERE t1.t = (SELECT t1.t FROM t1 > WHERE t1.t < t2.t AND t1.i2=1 AND t2.i1=t1.i1 > @@ -4522,13 +4522,13 @@ SET join_cache_level=0; > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > @@ -4575,7 +4575,7 @@ FROM t1 > WHERE a = 230; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > SELECT MAX(b), (SELECT COUNT(*) FROM st1,st2 WHERE st2.b <= t1.b) > FROM t1 > WHERE a = 230; > @@ -5710,7 +5710,7 @@ WHERE ('0') IN ( SELECT a FROM t1 GROUP > GROUP BY b; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > SELECT b FROM t1 > WHERE ('0') IN ( SELECT a FROM t1 GROUP BY a ) > GROUP BY b; > @@ -6525,7 +6525,7 @@ EXPLAIN > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), (SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 NULL > @@ -6533,7 +6533,7 @@ EXPLAIN > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(f1), exists(SELECT f1 FROM t1 WHERE f2 > 0 limit 1) AS f4 FROM t2, t1 WHERE 'v'= f3; > COUNT(f1) f4 > 0 0 > @@ -6568,7 +6568,7 @@ WHERE alias1.a = alias2.a OR alias1.a = > HAVING field>'B' AND ( 'Moscow' ) IN ( SELECT a FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) AS field > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR alias1.a = 'y' > @@ -6582,7 +6582,7 @@ id select_type table type possible_keys > 1 PRIMARY alias1 index a a 19 NULL 11 Using where; Using index > 1 PRIMARY alias2 ref a a 19 test.alias1.a 2 Using index > 1 PRIMARY alias3 index NULL a 19 NULL 11 Using index; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > +2 SUBQUERY t1 index_subquery a a 19 const 1 Using index; Using where > SELECT MAX( alias2.a ) > FROM t1 AS alias1, t1 AS alias2, t1 AS alias3 > WHERE alias1.a = alias2.a OR ('Moscow') IN ( SELECT a FROM t1 ); > @@ -6610,6 +6610,91 @@ SELECT * FROM t1 > WHERE a1 = (SELECT COUNT(*) FROM t1 WHERE a1 IN (SELECT a1 FROM t1, t2)); > a1 > drop table t1, t2; > +# > +# MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +# inner joins takes hundreds times longer > +# > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > +set @@expensive_subquery_limit= 0; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using where > +2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 6 > +Subquery_cache_miss 2 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 8 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 22 > +set @@expensive_subquery_limit= default; > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY alias1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY alias2 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +1 PRIMARY alias3 ALL NULL NULL NULL NULL 2 Using join buffer (flat, BNL join) > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > +3 SUBQUERY t3 ALL NULL NULL NULL NULL 2 > +flush status; > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > +(SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +NULL > +show status like "subquery_cache%"; > +Variable_name Value > +Subquery_cache_hit 0 > +Subquery_cache_miss 0 > +show status like '%Handler_read%'; > +Variable_name Value > +Handler_read_first 0 > +Handler_read_key 0 > +Handler_read_last 0 > +Handler_read_next 0 > +Handler_read_prev 0 > +Handler_read_rnd 0 > +Handler_read_rnd_deleted 0 > +Handler_read_rnd_next 16 > +drop table t1, t2, t3; > # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/r/subselect_partial_match.result' > --- a/mysql-test/r/subselect_partial_match.result 2011-12-04 21:31:42 +0000 > +++ b/mysql-test/r/subselect_partial_match.result 2012-05-29 21:18:53 +0000 > @@ -879,7 +879,7 @@ EXPLAIN > SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT b, a FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where > SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT b, a FROM t2); > c > 0 > @@ -888,7 +888,7 @@ EXPLAIN > SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT a, b FROM t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > -2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where > SELECT * FROM t1 WHERE (6, 4 ) NOT IN (SELECT a, b FROM t2); > c > 0 > @@ -913,7 +913,7 @@ set @@optimizer_switch='in_to_exists=on, > EXPLAIN SELECT * FROM t2 WHERE ( 3 , 1 ) NOT IN ( SELECT f1 , f2 FROM t1 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 3 Using where > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 3 Using where > SELECT * FROM t2 WHERE ( 3 , 1 ) NOT IN ( SELECT f1 , f2 FROM t1 ); > f3 > 5 > > === modified file 'mysql-test/r/subselect_sj_mat.result' > --- a/mysql-test/r/subselect_sj_mat.result 2012-05-17 10:46:05 +0000 > +++ b/mysql-test/r/subselect_sj_mat.result 2012-05-29 21:18:53 +0000 > @@ -1198,7 +1198,7 @@ set @@optimizer_switch='materialization= > explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > min(a1) > NULL > @@ -1207,7 +1207,7 @@ set @@optimizer_switch='semijoin=off'; > explain select min(a1) from t1 where 7 in (select b1 from t2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2); > min(a1) > NULL > @@ -1224,7 +1224,7 @@ NULL > explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > min(a1) > NULL > > === modified file 'mysql-test/t/subselect.test' > --- a/mysql-test/t/subselect.test 2012-05-18 11:52:01 +0000 > +++ b/mysql-test/t/subselect.test 2012-05-29 21:18:53 +0000 > @@ -5580,5 +5580,49 @@ WHERE a1 = (SELECT COUNT(*) FROM t1 WHER > > drop table t1, t2; > > +--echo # > +--echo # MDEV-287 CHEAP SQ: A query with subquery in SELECT list, EXISTS, > +--echo # inner joins takes hundreds times longer > +--echo # > + > +CREATE TABLE t1 (a INT); > +INSERT INTO t1 VALUES (1),(7); > + > +CREATE TABLE t2 (b INT); > +INSERT INTO t2 VALUES (4),(5); > + > +CREATE TABLE t3 (c INT); > +INSERT INTO t3 VALUES (8),(3); > + > +set @@expensive_subquery_limit= 0; > + > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > + > +flush status; > + > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > + > +show status like "subquery_cache%"; > +show status like '%Handler_read%'; > + > +set @@expensive_subquery_limit= default; > + > +EXPLAIN > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > + > +flush status; > + > +SELECT (SELECT MIN(b) FROM t1, t2 WHERE b = a AND (b = alias1.b OR EXISTS (SELECT * FROM t3))) > +FROM t2 alias1, t1 alias2, t1 alias3; > + > +show status like "subquery_cache%"; > +show status like '%Handler_read%'; > + > +drop table t1, t2, t3; > + > --echo # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > > === modified file 'sql/sql_lex.cc' > --- a/sql/sql_lex.cc 2012-05-17 10:46:05 +0000 > +++ b/sql/sql_lex.cc 2012-05-29 21:18:53 +0000 > @@ -3443,6 +3443,7 @@ bool st_select_lex::optimize_unflattened > } > > bool empty_union_result= true; > + bool is_correlated_unit= false; > /* > If the subquery is a UNION, optimize all the subqueries in the UNION. If > there is no UNION, then the loop will execute once for the subquery. > @@ -3467,6 +3468,8 @@ bool st_select_lex::optimize_unflattened > inner_join->select_options|= SELECT_DESCRIBE; > } > res= inner_join->optimize(); > + sl->update_correlated_cache(); > + is_correlated_unit|= sl->is_correlated; > inner_join->select_options= save_options; > un->thd->lex->current_select= save_select; > if (empty_union_result) > @@ -3482,6 +3485,9 @@ bool st_select_lex::optimize_unflattened > } > if (empty_union_result) > subquery_predicate->no_rows_in_result(); > + if (!is_correlated_unit) > + un->uncacheable&= ~UNCACHEABLE_DEPENDENT; > + subquery_predicate->is_correlated= is_correlated_unit; > } > } > return FALSE; > @@ -3850,6 +3856,61 @@ void SELECT_LEX::update_used_tables() > } > > > +/** > + @brief > + Update is_correlated cache for this select > + > + @details > +*/ > + > +void st_select_lex::update_correlated_cache() > +{ > + TABLE_LIST *tl; > + List_iterator<TABLE_LIST> ti(leaf_tables); > + > + is_correlated= false; > + > + while ((tl= ti++)) > + { > + if (tl->on_expr) > + is_correlated|= test(tl->on_expr->used_tables() & OUTER_REF_TABLE_BIT); > + for (TABLE_LIST *embedding= tl->embedding ; embedding ; > + embedding= embedding->embedding) > + { > + if (embedding->on_expr) > + is_correlated|= test(embedding->on_expr->used_tables() & > + OUTER_REF_TABLE_BIT); > + } > + } > + > + if (join->conds) > + is_correlated|= test(join->conds->used_tables() & OUTER_REF_TABLE_BIT); > + > + if (join->having) > + is_correlated|= test(join->having->used_tables() & OUTER_REF_TABLE_BIT); > + > + if (join->tmp_having) > + is_correlated|= test(join->tmp_having->used_tables() & OUTER_REF_TABLE_BIT); > + > + Item *item; > + List_iterator_fast<Item> it(join->fields_list); > + while ((item= it++)) > + is_correlated|= test(item->used_tables() & OUTER_REF_TABLE_BIT); > + > + for (ORDER *order= group_list.first; order; order= order->next) > + is_correlated|= test((*order->item)->used_tables() & OUTER_REF_TABLE_BIT); > + > + if (!master_unit()->is_union()) > + { > + for (ORDER *order= order_list.first; order; order= order->next) > + is_correlated|= test((*order->item)->used_tables() & OUTER_REF_TABLE_BIT); > + } > + > + if (!is_correlated) > + uncacheable&= ~UNCACHEABLE_DEPENDENT; > +} > + > + > /** > Set the EXPLAIN type for this subquery. > */ > > === modified file 'sql/sql_lex.h' > --- a/sql/sql_lex.h 2012-05-17 10:46:05 +0000 > +++ b/sql/sql_lex.h 2012-05-29 21:18:53 +0000 > @@ -1018,6 +1018,7 @@ class st_select_lex: public st_select_le > void mark_as_belong_to_derived(TABLE_LIST *derived); > void increase_derived_records(ha_rows records); > void update_used_tables(); > + void update_correlated_cache(); > void mark_const_derived(bool empty); > > bool save_leaf_tables(THD *thd); > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] MDEV-181: XID crash recovery across binlog boundaries
by Sergei Golubchik 12 Jun '12

12 Jun '12

Hi, Kristian! Here's my review. Only few comments and questions, see below. On May 14, Kristian Nielsen wrote: > At http://bazaar.launchpad.net/~maria-captains/maria/5.5 > > ------------------------------------------------------------ > revno: 3372 > revision-id: knielsen(a)knielsen-hq.org-20120514095140-n685kn0n4vtronn5 > timestamp: Mon 2012-05-14 11:51:40 +0200 > message: > MDEV-181: XID crash recovery across binlog boundaries > === added file 'mysql-test/suite/binlog/t/binlog_xa_recover.test' > --- mysql-test/suite/binlog/t/binlog_xa_recover.test 1970-01-01 00:00:00 +0000 > +++ mysql-test/suite/binlog/t/binlog_xa_recover.test 2012-05-14 09:51:40 +0000 > @@ -0,0 +1,172 @@ > +--source include/have_innodb.inc > +--source include/have_debug.inc > +--source include/have_debug_sync.inc > +--source include/have_binlog_format_row.inc > + > +SET GLOBAL max_binlog_size= 4096; > + > +CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb; > +CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Myisam; > + > +# Transactions are not guaranteed stored durably on disk in the engine until > +# they are fsync()ed, which normally happens during commit(). But there is no > +# guarantee that they will _not_ be durable, in particular loosing results > +# of a write(2) system call normally requires a kernel crash (as opposed to > +# just mysqld crash), which is inconvenient to do in a test suite. > +# So instead we do an error insert to prevent commit_ordered() from being > +# called in the engine - so nothing will be written to disk at all, and crash > +# recovery is sure to be needed. Are these assumptions reasonable? You seem to assume that without commit_ordered the engine will still work normally. but simply won't write changes to disk. Is it always the case? > +SET @@global.debug_dbug='+d,skip_commit_ordered'; I don't see where you restore the old value of debug_dbug > + > +INSERT INTO t1 VALUES (0, REPEAT("x", 4100)); how comes this insert is not affected by skip_commit_ordered ? > + > +# Now start a bunch of transactions that span multiple binlog > +# files. Leave then in the state prepared-but-not-committed in the engine > +# and crash the server. Check that crash recovery is able to recover all > +# of them. > + > +connect(con1,localhost,root,,); > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con1_ready WAIT_FOR _ever"; > +send INSERT INTO t1 VALUES (1, REPEAT("x", 4100)); > + > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con1_ready"; > +INSERT INTO t2 VALUES (1, "force binlog rotation"); > + > +connect(con2,localhost,root,,); > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con2_ready WAIT_FOR _ever"; > +send INSERT INTO t1 VALUES (2, NULL); > + > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con2_ready"; > + > +connect(con3,localhost,root,,); > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con3_ready WAIT_FOR _ever"; > +send INSERT INTO t1 VALUES (3, REPEAT("x", 4100)); > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con3_ready"; > +INSERT INTO t2 VALUES (2, "force binlog rotation"); > +# So we won't get warnings about t2 being crashed. > +FLUSH TABLES t2; > + > +# Check that everything is committed in binary log. > +--source include/show_binary_logs.inc > +--let $binlog_file= master-bin.000001 > +--let $binlog_start= 4 > +--source include/show_binlog_events.inc > +--let $binlog_file= master-bin.000002 > +--source include/show_binlog_events.inc > +--let $binlog_file= master-bin.000003 > +--source include/show_binlog_events.inc > +--let $binlog_file= master-bin.000004 > +--source include/show_binlog_events.inc > + > +# Check that transactions really are not yet committed in engine. > +# (This works because of debug_dbug='+d,skip_commit_ordered'). > +--echo We should see only one entry here, a=0: > +SELECT a FROM t1 ORDER BY a; > + > + > +# Check that server will not purge too much. > +PURGE BINARY LOGS TO "master-bin.000004"; > +--source include/show_binary_logs.inc > + > +# Now crash the server with one more transaction in prepared state. > +system echo wait-binlog_xa_recover.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; better use --write_file directive > +SET SESSION debug_dbug="+d,crash_commit_after_log"; > +--error 2006,2013 > +INSERT INTO t1 VALUES (4, NULL); > + > +system echo restart-group_commit_binlog_pos.test >> $MYSQLTEST_VARDIR/tmp/mysqld.1.expect; same > + > +connection default; > +--enable_reconnect > +--source include/wait_until_connected_again.inc > + > +# Check that all transactions are recovered. > +SELECT a FROM t1 ORDER BY a; > + > + > +--echo *** Test that RESET MASTER waits for pending XIDs to be unlogged. Ah, good point > + > +SET @old_max_binlog_size= @@global.max_binlog_size; > +SET GLOBAL max_binlog_size= 4096; > +# con10 will hang with a pending XID, blocking RESET MASTER. > +connect(con10,localhost,root,,); > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con10_ready WAIT_FOR con10_go"; > +send INSERT INTO t1 VALUES (10, NULL); > + > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con10_ready"; > +# Let's add a few binlog rotations just for good measure. > +INSERT INTO t2 VALUES (10, REPEAT("x", 4100)); > +INSERT INTO t2 VALUES (11, REPEAT("x", 4100)); > +--source include/show_binary_logs.inc > +SET DEBUG_SYNC= "execute_command_after_close_tables SIGNAL reset_master_done"; > +send RESET MASTER; > + > +connect(con11,localhost,root,,); > +--echo This will timeout, as RESET MASTER is blocked > +SET DEBUG_SYNC= "now WAIT_FOR reset_master_done TIMEOUT 1"; > +# Wake up transaction to allow RESET MASTER to complete. > +SET DEBUG_SYNC= "now SIGNAL con10_go"; > + > +connection con10; > +reap; > + > +connection default; > +reap; > +--source include/show_binary_logs.inc > + > + > +--echo *** Test that binlog N is active, and last pending trx in (N-1) is > +--echo unlogged while there is still a pending trx in (N-2). > + > +connection con10; > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con10_ready WAIT_FOR con10_continue"; > +send INSERT INTO t1 VALUES (20, REPEAT("x", 4100)); > + > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con10_ready"; > +INSERT INTO t2 VALUES (3, "force binlog rotation"); > + > +connection con11; > +SET DEBUG_SYNC= "ha_commit_trans_after_log_and_order SIGNAL con11_ready WAIT_FOR con11_continue"; > +send INSERT INTO t1 VALUES (21, REPEAT("x", 4100)); > + > +connection default; > +SET DEBUG_SYNC= "now WAIT_FOR con11_ready"; > +INSERT INTO t2 VALUES (4, "force binlog rotation"); > +--source include/show_binary_logs.inc > +--let $binlog_file= master-bin.000001 > +--source include/show_binlog_events.inc > +--let $binlog_file= master-bin.000002 > +--source include/show_binlog_events.inc > +--let $binlog_file= master-bin.000003 > +--source include/show_binlog_events.inc > + > +SET DEBUG_SYNC= "now SIGNAL con11_continue"; > + > +connection con11; > +reap; > + > +connection default; > +--echo con10 is still pending, no new binlog checkpoint should have been logged. > +--let $binlog_file= master-bin.000003 > +--source include/show_binlog_events.inc > + > +SET DEBUG_SYNC= "now SIGNAL con10_continue"; > + > +connection con10; > +reap; > + > +connection default; > +--echo No XIDs are pending, a new binlog checkpoint should have been logged. Could you also test recovery with multiple checkpoints in a binlog? E.g. binlog, like the above, then crash, and see that it uses the *last* checkpoint in the binlog. > +--let $binlog_file= master-bin.000003 > +--source include/show_binlog_events.inc > + > + > +# Cleanup > +connection default; > +DROP TABLE t1, t2; > +SET GLOBAL max_binlog_size= @old_max_binlog_size; > > === modified file 'sql/log.h' > --- sql/log.h 2012-01-16 19:16:35 +0000 > +++ sql/log.h 2012-05-14 09:51:40 +0000 > @@ -348,6 +348,15 @@ > time_t last_time; > }; > > +/* > + We assign each binlog file an internal ID, used to identify them for unlog(). > + Ids start from BINLOG_COOKIE_START; the value BINLOG_COOKIE_DUMMY is special > + meaning "no binlog" (we cannot use zero as that is reserved for error return > + from log_and_order). > +*/ > +#define BINLOG_COOKIE_DUMMY 1 > +#define BINLOG_COOKIE_START 2 Are these values completely internal and can be changed in any minor release without any compatibility concerns? Or they're written to binlog or something? > + > class binlog_cache_mngr; > class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG > { > @@ -388,10 +397,40 @@ > bool all; > }; > > + /* > + A list of struct xid_count_per_binlog is used to keep track of how many > + XIDs are in preared, but not committed, state in each binlog. "prepared" > + > + When count drops to zero in a binlog after rotation, it means that there > + are no more XIDs in prepared state, so that binlog is no longer needed > + for XA crash recovery, and we can log a new binlog checkpoint event. > + > + The list is protected against simultaneous access from multiple > + threads by LOCK_xid_list. > + */ > + struct xid_count_per_binlog : public ilink { > + char *binlog_name; > + uint binlog_name_len; > + ulong binlog_id; > + long xid_count; > + xid_count_per_binlog(); /* Give link error if constructor used. */ > + }; > + ulong current_binlog_id; > + I_List<xid_count_per_binlog> binlog_xid_count_list; Why I_List? > + /* > + When this is set, a RESET MASTER is in progress. > + > + Then we should not write any binlog checkpoints into the binlog (that > + could result in deadlock on LOCK_log, and we will delete all binlog files > + anyway). Instead we should signal COND_prep_xids whenever a new binlog COND_xid_list? > + checkpoint arrives - when all have arrived, RESET MASTER will complete. > + */ > + bool reset_master_pending; > + > /* LOCK_log and LOCK_index are inited by init_pthread_objects() */ > mysql_mutex_t LOCK_index; > - mysql_mutex_t LOCK_prep_xids; > - mysql_cond_t COND_prep_xids; > + mysql_mutex_t LOCK_xid_list; > + mysql_cond_t COND_xid_list; > mysql_cond_t update_cond; > ulonglong bytes_written; > IO_CACHE index_file; > @@ -415,7 +454,6 @@ It'd be great, if your diff would include function names (diff -p). An easy way of doing it is to use my diff_p plugin, see the last section in http://kb.askmonty.org/en/how-to-get-more-out-of-bzr-when-working-on-mariadb it's the most flexible, robust and universal solution that I have, and it puts function names in all bzr-generated diffs, not only in "bzr diff" command. > fix_max_relay_log_size). > */ > ulong max_size; > - long prepared_xids; /* for tc log - number of xids to remember */ > // current file sequence number for load data infile binary logging > uint file_id; > uint open_count; // For replication > === modified file 'sql/log_event.cc' > --- sql/log_event.cc 2012-05-09 07:35:46 +0000 > +++ sql/log_event.cc 2012-05-14 09:51:40 +0000 > @@ -5842,6 +5848,84 @@ > > > /************************************************************************** > + Binlog_checkpoint_log_event methods > +**************************************************************************/ > + > +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) > +void Binlog_checkpoint_log_event::pack_info(Protocol *protocol) > +{ > + protocol->store(binlog_file_name, binlog_file_len, &my_charset_bin); > +} > +#endif > + > + > +#ifdef MYSQL_CLIENT > +void Binlog_checkpoint_log_event::print(FILE *file, > + PRINT_EVENT_INFO *print_event_info) > +{ > + Write_on_release_cache cache(&print_event_info->head_cache, file, > + Write_on_release_cache::FLUSH_F); > + > + if (print_event_info->short_form) > + return; > + print_header(&cache, print_event_info, FALSE); > + my_b_printf(&cache, "\tBinlog checkpoint "); > + my_b_write(&cache, (uchar*)binlog_file_name, binlog_file_len); > + my_b_printf(&cache, "\n"); > +} > +#endif /* MYSQL_CLIENT */ > + > + > +#ifdef MYSQL_SERVER > +Binlog_checkpoint_log_event::Binlog_checkpoint_log_event( > + const char *binlog_file_name_arg, > + uint binlog_file_len_arg) > + :Log_event(), > + binlog_file_name(my_strndup(binlog_file_name_arg, binlog_file_len_arg, > + MYF(MY_WME))), > + binlog_file_len(binlog_file_len_arg) > +{ > + cache_type= EVENT_NO_CACHE; > +} > +#endif /* MYSQL_SERVER */ > + > + > +Binlog_checkpoint_log_event::Binlog_checkpoint_log_event( > + const char *buf, uint event_len, > + const Format_description_log_event *description_event) > + :Log_event(buf, description_event), binlog_file_name(0) > +{ > + uint8 header_size= description_event->common_header_len; > + uint8 post_header_len= > + description_event->post_header_len[BINLOG_CHECKPOINT_EVENT-1]; > + if (event_len < header_size + post_header_len || > + post_header_len < 4) I'd replace this 4 with BINLOG_CHECKPOINT_HEADER_LEN > + return; > + buf+= header_size; and here I'd add compile_time_assert(BINLOG_CHECKPOINT_HEADER_LEN == 4); // see uint4korr and int4store below > + binlog_file_len= uint4korr(buf); > + if (event_len - (header_size + post_header_len) < binlog_file_len) > + return; > + binlog_file_name= my_strndup(buf + post_header_len, binlog_file_len, > + MYF(MY_WME)); > + return; > +} > + > + > +#ifndef MYSQL_CLIENT > +bool Binlog_checkpoint_log_event::write(IO_CACHE *file) > +{ > + uchar buf[BINLOG_CHECKPOINT_HEADER_LEN]; > + int4store(buf, binlog_file_len); > + return write_header(file, BINLOG_CHECKPOINT_HEADER_LEN + binlog_file_len) || > + wrapper_my_b_safe_write(file, buf, BINLOG_CHECKPOINT_HEADER_LEN) || > + wrapper_my_b_safe_write(file, (const uchar *)binlog_file_name, > + binlog_file_len) || > + write_footer(file); > +} > +#endif /* MYSQL_CLIENT */ > + > + > +/************************************************************************** > Intvar_log_event methods > **************************************************************************/ > > === modified file 'sql/log.cc' > --- sql/log.cc 2012-04-10 06:28:13 +0000 > +++ sql/log.cc 2012-05-14 09:51:40 +0000 > @@ -2912,13 +2929,30 @@ > DBUG_ENTER("cleanup"); > if (inited) > { > + xid_count_per_binlog *b; > + > inited= 0; > close(LOG_CLOSE_INDEX|LOG_CLOSE_STOP_EVENT); > delete description_event_for_queue; > delete description_event_for_exec; > + > + while ((b= binlog_xid_count_list.get())) 'get' - what a bad name. I checked the implementation and now I know what it's doing, but absoletely not what one would expect :( It's not your fault, of course, just ranting... > + { > + /* > + There should be no pending XIDs at shutdown, and only one entry (for > + the active binlog file) in the list. > + */ > + DBUG_ASSERT(b->xid_count == 0); > + DBUG_ASSERT(!binlog_xid_count_list.head()); > + my_free(b); > + } > + > mysql_mutex_destroy(&LOCK_log); > mysql_mutex_destroy(&LOCK_index); > + mysql_mutex_destroy(&LOCK_xid_list); > mysql_cond_destroy(&update_cond); > + mysql_cond_destroy(&COND_queue_busy); > + mysql_cond_destroy(&COND_xid_list); > } > DBUG_VOID_RETURN; > } > @@ -3506,6 +3587,42 @@ > mysql_mutex_lock(&LOCK_log); > mysql_mutex_lock(&LOCK_index); > > + if (!is_relay_log) > + { > + /* > + We are going to nuke all binary log files. > + So first wait until all pending binlog checkpoints have completed. > + */ > + mysql_mutex_lock(&LOCK_xid_list); > + xid_count_per_binlog *b; > + reset_master_pending= true; > + for (;;) > + { > + I_List_iterator<xid_count_per_binlog> it(binlog_xid_count_list); > + while ((b= it++)) > + { > + if (b->xid_count > 0) > + break; > + } > + if (!b) > + break; /* No more pending XIDs */ > + /* > + Wait until signalled that one more binlog dropped to zero, then check > + again. > + */ > + mysql_cond_wait(&COND_xid_list, &LOCK_xid_list); > + } I would've done it simpler, like while (b= binlog_xid_count_list.head()) { while (b->xid_count > 0) mysql_cond_wait(&COND_xid_list, &LOCK_xid_list); my_free(binlog_xid_count_list.get()); } > + > + /* > + Now all XIDs are fully flushed to disk, and we are holding LOCK_log so > + no new ones will be written. So we can proceed to delete the logs. > + */ > + while ((b= binlog_xid_count_list.get())) > + my_free(b); > + reset_master_pending= false; > + mysql_mutex_unlock(&LOCK_xid_list); > + } > + > /* > The following mutex is needed to ensure that no threads call > 'delete thd' as we would then risk missing a 'rollback' from this > @@ -5761,6 +5877,37 @@ > DBUG_RETURN(error); > } > > +void > +MYSQL_BIN_LOG::write_binlog_checkpoint_event_already_locked(const char *name, > + uint len) > +{ > + Binlog_checkpoint_log_event ev(name, len); > + /* > + Note that we must sync the binlog checkpoint to disk. > + Otherwise a subsequent log purge could delete binlogs that XA recovery > + thinks are needed (even though they are not really). > + */ > + if (!ev.write(&log_file) && !flush_and_sync(0)) > + { > + bool check_purge= false; > + signal_update(); > + rotate(false, &check_purge); > + if (check_purge) > + purge(); why "write binlog checkpoint event" implies signal_update(), rotate(), and purge() ? > + return; > + } > + > + /* > + If we fail to write the checkpoint event, something is probably really > + bad with the binlog. We complain in the error log. > + Note that failure to write binlog checkpoint does not compromise the > + ability to do crash recovery - crash recovery will just have to scan a > + bit more of the binlog than strictly necessary. > + */ > + sql_print_error("Failed to write binlog checkpoint event to binary log\n"); > +} > + > + > /** > Write a cached log entry to the binary log. > - To support transaction over replication, we wrap the transaction > @@ -6061,11 +6207,11 @@ > { > /* > If we fail to rotate, which thread should get the error? > - We give the error to the *last* transaction thread; that seems to > - make the most sense, as it was the last to write to the log. > + We give the error to the leader, as any my_error() thrown inside > + rotate() will have been registered for the leader THD. > */ > - last_in_queue->error= ER_ERROR_ON_WRITE; > - last_in_queue->commit_errno= errno; > + leader->error= ER_ERROR_ON_WRITE; > + leader->commit_errno= errno; Where did that change happen? Is it related to MDEV-181 at all, or it's an unrelated bugfix? > check_purge= false; > } > } > @@ -6082,9 +6228,6 @@ > */ > mysql_mutex_unlock(&LOCK_log); > > - if (check_purge) > - purge(); Why was it moved down? > - > DEBUG_SYNC(leader->thd, "commit_after_release_LOCK_log"); > ++num_group_commits; > > @@ -7427,11 +7560,23 @@ > > cache_mngr->using_xa= TRUE; > cache_mngr->xa_xid= xid; > +#ifndef DBUG_OFF > + cache_mngr->cookie= 0; > +#endif > err= binlog_commit_flush_xid_caches(thd, cache_mngr, all, xid); > > DEBUG_SYNC(thd, "binlog_after_log_and_order"); > > - DBUG_RETURN(!err); > + if (err) > + DBUG_RETURN(0); > + /* > + If using explicit user XA, we will not have XID. We must still return a > + non-zero cookie (as zero cookie signals error). > + */ > + if (!xid) > + DBUG_RETURN(1); s/1/BINLOG_COOKIE_DUMMY/ > + DBUG_ASSERT(cache_mngr->cookie != 0); > + DBUG_RETURN(cache_mngr->cookie); > } > > /* > @@ -7446,40 +7591,135 @@ > binary log. > */ > void > -TC_LOG_BINLOG::mark_xids_active(uint xid_count) > +TC_LOG_BINLOG::mark_xids_active(ulong cookie, uint xid_count) > { > + xid_count_per_binlog *b; > + > DBUG_ENTER("TC_LOG_BINLOG::mark_xids_active"); > - DBUG_PRINT("info", ("xid_count=%u", xid_count)); > - mysql_mutex_lock(&LOCK_prep_xids); > - prepared_xids+= xid_count; > - mysql_mutex_unlock(&LOCK_prep_xids); > + DBUG_PRINT("info", ("cookie=%lu xid_count=%u", cookie, xid_count)); > + DBUG_ASSERT(cookie != 0 && cookie != BINLOG_COOKIE_DUMMY); > + > + mysql_mutex_lock(&LOCK_xid_list); > + I_List_iterator<xid_count_per_binlog> it(binlog_xid_count_list); > + while ((b= it++)) > + { > + if (b->binlog_id == cookie) > + { > + b->xid_count += xid_count; > + break; > + } > + } > + /* > + As we do not delete elements until count reach zero, elements should always > + be found. > + */ > + DBUG_ASSERT(b); > + mysql_mutex_unlock(&LOCK_xid_list); > DBUG_VOID_RETURN; > } > > /* > - Once an XID is committed, it is safe to rotate the binary log, as it can no > - longer be needed during crash recovery. > + Once an XID is committed, it can no longer be needed during crash recovery, > + as it has been durably recorded on disk as "committed". > > This function is called to mark an XID this way. It needs to decrease the > - count of pending XIDs, and signal the log rotator thread when it reaches zero. > + count of pending XIDs in the corresponding binlog. When the count reaches > + zero (for an "old" binlog that is not the active one), that binlog file no > + longer need to be scanned during crash recovery, so we can log a new binlog > + checkpoint. > */ > void > -TC_LOG_BINLOG::mark_xid_done() > +TC_LOG_BINLOG::mark_xid_done(ulong cookie) > { > - my_bool send_signal; > + xid_count_per_binlog *b; > + bool first; > + ulong current; > > DBUG_ENTER("TC_LOG_BINLOG::mark_xid_done"); > - mysql_mutex_lock(&LOCK_prep_xids); > - // prepared_xids can be 0 if the transaction had ignorable errors. > - DBUG_ASSERT(prepared_xids >= 0); > - if (prepared_xids > 0) > - prepared_xids--; > - send_signal= (prepared_xids == 0); > - mysql_mutex_unlock(&LOCK_prep_xids); > - if (send_signal) { > - DBUG_PRINT("info", ("prepared_xids=%lu", prepared_xids)); > - mysql_cond_signal(&COND_prep_xids); > - } > + if (cookie == BINLOG_COOKIE_DUMMY) > + DBUG_VOID_RETURN; /* Nothing to do. */ > + > + mysql_mutex_lock(&LOCK_xid_list); > + current= current_binlog_id; > + I_List_iterator<xid_count_per_binlog> it(binlog_xid_count_list); > + first= true; > + while ((b= it++)) > + { > + if (b->binlog_id == cookie) > + { > + --b->xid_count; > + break; > + } > + first= false; > + } > + /* Binlog is always found, as we do not remove until count reaches 0 */ > + DBUG_ASSERT(b); > + if (likely(cookie == current && !reset_master_pending) || > + b->xid_count != 0 || !first) > + { > + /* No new binlog checkpoint reached yet. */ > + mysql_mutex_unlock(&LOCK_xid_list); > + DBUG_VOID_RETURN; > + } > + > + /* > + Now log a binlog checkpoint for the first binlog file with a non-zero count. > + > + Note that it is possible (though perhaps unlikely) that when count of > + binlog (N-2) drops to zero, binlog (N-1) is already at zero. So we may > + need to skip several entries before we find the one to log in the binlog > + checkpoint event. > + > + We chain the locking of LOCK_xid_list and LOCK_log, so that we ensure that > + Binlog_checkpoint_events are logged in order. This simplifies recovery a > + bit, as it can just take the last binlog checkpoint in the log, rather > + than compare all found against each other to find the one pointing to the > + most recent binlog. > + > + Note also that we need to first release LOCK_xid_list, then aquire > + LOCK_log, then re-aquire LOCK_xid_list. If we were to take LOCK_log while > + holding LOCK_xid_list, we might deadlock with other threads that take the > + locks in the opposite order. > + > + If a RESET MASTER is pending, we are about to remove all log files, and > + the RESET MASTER thread is waiting for all pending unlog() calls to > + complete while holding LOCK_log. In this case we should not log a binlog > + checkpoint event (it would be deleted immediately anywat and we would > + deadlock on LOCK_log) but just signal the thread. > + */ > + if (!reset_master_pending) > + { > + mysql_mutex_unlock(&LOCK_xid_list); > + mysql_mutex_lock(&LOCK_log); > + mysql_mutex_lock(&LOCK_xid_list); > + } > + for (;;) > + { > + /* Remove initial element(s) with zero count. */ > + b= binlog_xid_count_list.get(); Eh. You need to check whether binlog_xid_count_list.head()->xid_count == 0 before removing it like that. When you released LOCK_xid_list another thread could've taken over and deleted all zero count elements. So now you could find that binlog_xid_count_list.head() has non-zero count. > + my_free(b); > + b= binlog_xid_count_list.head(); > + /* > + Normally, we must not remove all elements in the list. > + Only if a RESET MASTER is in progress may we delete everything - RESET > + MASTER has LOCK_log held, and will create a new initial element before > + releasing the lock. > + */ > + DBUG_ASSERT(b || reset_master_pending); > + if (unlikely(!b) || likely(b->binlog_id == current) || b->xid_count > 0) > + break; > + } > + if (reset_master_pending) > + { > + mysql_cond_signal(&COND_xid_list); > + mysql_mutex_unlock(&LOCK_xid_list); > + DBUG_VOID_RETURN; > + } > + > + mysql_mutex_unlock(&LOCK_xid_list); > + write_binlog_checkpoint_event_already_locked(b->binlog_name, > + b->binlog_name_len); > + mysql_mutex_unlock(&LOCK_log); > DBUG_VOID_RETURN; > } > > @@ -7507,19 +7755,104 @@ > > fdle->flags&= ~LOG_EVENT_BINLOG_IN_USE_F; // abort on the first error > > - while ((ev= Log_event::read_log_event(log, 0, fdle, > - opt_master_verify_checksum)) > - && ev->is_valid()) > + /* > + Scan the binlog for XIDs that need to be committed if still in the > + prepared stage. > + > + Start with the latest binlog file, then continue with any other binlog > + files if the last found binlog checkpoint indicates it is needed. > + */ > + > + first_round= true; > + for (;;) > { > - if (ev->get_type_code() == XID_EVENT) > - { > - Xid_log_event *xev=(Xid_log_event *)ev; > - uchar *x= (uchar *) memdup_root(&mem_root, (uchar*) &xev->xid, > - sizeof(xev->xid)); > - if (!x || my_hash_insert(&xids, x)) > + while ((ev= Log_event::read_log_event(first_round ? first_log : &log, > + 0, fdle, opt_master_verify_checksum)) > + && ev->is_valid()) > + { > + switch (ev->get_type_code()) > + { > + case XID_EVENT: > + { > + Xid_log_event *xev=(Xid_log_event *)ev; > + uchar *x= (uchar *) memdup_root(&mem_root, (uchar*) &xev->xid, > + sizeof(xev->xid)); > + if (!x || my_hash_insert(&xids, x)) > + { > + delete ev; > + goto err2; > + } > + break; > + } > + case BINLOG_CHECKPOINT_EVENT: > + if (first_round) > + { > + Binlog_checkpoint_log_event *cev= (Binlog_checkpoint_log_event *)ev; > + if (cev->binlog_file_len >= FN_REFLEN) > + { > + sql_print_error("Incorrect binlog checkpoint event with too long " > + "file name found. Aborting."); This is a recovery. After a crash. You can be more tolerant here. In this particular case there is no need to abort, you can safely ignore incorrect checkpoints. This only means that the recovery will start from the previous checkpoint and it'll take longer. > + delete ev; > + goto err2; > + } > + binlog_checkpoint_len= cev->binlog_file_len; > + memcpy(binlog_checkpoint_name, cev->binlog_file_name, > + binlog_checkpoint_len); > + binlog_checkpoint_name[binlog_checkpoint_len]= '\0'; > + break; > + } > + default: > + /* Nothing. */ > + break; > + } > + delete ev; > + } > + > + /* > + If the last binlog checkpoint event points to an older log, we have to > + scan all logs from there also, to get all possible XIDs to recover. > + > + If there was no binlog checkpoint event at all, this means the log was > + written by an older version of MariaDB (or MySQL) - these always have an > + (implicit) binlog checkpoint event at the start of the last binlog file. > + */ > + if (first_round) > + { > + if (!binlog_checkpoint_len) > + break; > + first_round= false; > + if (find_log_pos(linfo, binlog_checkpoint_name, 1)) > + { > + sql_print_error("Binlog file '%s' not found in binlog index, needed " > + "for recovery. Aborting.", binlog_checkpoint_name); > goto err2; > - } > - delete ev; > + } > + } > + else > + { > + end_io_cache(&log); > + mysql_file_close(file, MYF(MY_WME)); > + file= -1; > + } > + > + if (0 == strcmp(linfo->log_file_name, last_log_name)) > + break; // No more files to do > + if ((file= open_binlog(&log, linfo->log_file_name, &errmsg)) < 0) > + { > + sql_print_error("%s", errmsg); > + goto err2; > + } > + /* > + We do not need to read the Format_description_log_event of other binlog > + files. It is not possible for a binlog checkpoint to span multiple > + binlog files written by different versions of the server. So we can use > + the first one read for reading from all binlog files. > + */ > + if (find_next_log(linfo, 1)) > + { > + sql_print_error("Error reading binlog files during recovery. Aborting."); > + goto err2; > + } > } > > if (ha_recover(&xids)) > === modified file 'sql/sql_repl.cc' > --- sql/sql_repl.cc 2012-04-27 08:20:38 +0000 > +++ sql/sql_repl.cc 2012-05-14 09:51:40 +0000 > @@ -624,6 +624,30 @@ > } > > /* > + Do not send binlog checkpoint events to a slave that does not understand it. > + */ > + if (unlikely(event_type == BINLOG_CHECKPOINT_EVENT) && > + mariadb_slave_capability < MARIA_SLAVE_CAPABILITY_BINLOG_CHECKPOINT) > + { > + if (mariadb_slave_capability >= MARIA_SLAVE_CAPABILITY_TOLERATE_HOLES) > + { > + /* This slave can tolerate events omitted from the binlog stream. */ > + return NULL; > + } > + else > + { > + /* > + The slave does not understand BINLOG_CHECKPOINT_EVENT. Send a dummy > + event instead, with same length so slave does not get confused about > + binlog positions. > + */ Hm. Above and below the code that you've added events are simply skipped, without checks and dummy events. Why do you bother to replace with dummies? > + if (Query_log_event::dummy_event(packet, ev_offset, current_checksum_alg)) > + return "Failed to replace binlog checkpoint event with dummy: " > + "too small event."; > + } > + } > + > + /* > Skip events with the @@skip_replication flag set, if slave requested > skipping of such events. > */ Regards, Sergei

2 1

[Maria-developers] Fwd: crash in slave replication with XA transaction
by Zardosht Kasheff 11 Jun '12

11 Jun '12

Hello all, We see this on Maria 5.2 and Maria 5.5 as well. Does the following fix work? -Zardosht ---------- Forwarded message ---------- From: Rich Prohaska <prohaska(a)tokutek.com> Date: Mon, Jun 4, 2012 at 1:23 PM Subject: crash in slave replication with XA transaction To: internals(a)lists.mysql.com Hello, We are running MySQL 5.5.21 with both InnoDB and TokuDB as XA storage engines. When one runs a transaction that inserts into an InnoDB table and a TokuDB table, the commit crashes the replication slave at log.cc line 6602 because cache_mngr == NULL. We found a pattern in various log functions in log.cc that calls binlog_setup_trx_data to initialize the txn state. This change fixes our immediate problem. $ diff log.cc.orig log.cc 6595a6596,6597 > if (thd_get_ha_data(thd, binlog_hton) == NULL) > thd->binlog_setup_trx_data(); Is this a correct fix? If so, are there other places that need a similar change? Thanks Rich Prohaska The transaction is: create table t1 (a int primary key) engine=innodb; create table t2 (a int primary key) engine=tokudb; set autocommit=0; insert into t1 values (1); insert into t2 values (2); commit; the slave crashes while handling the commit binlog entry. -- MySQL Internals Mailing List For list archives: http://lists.mysql.com/internals To unsubscribe: http://lists.mysql.com/internals

3 5

Re: [Maria-developers] [Commits] Rev 3426: LP1008334 : Speedup specific datetime queries that got slower with introduction of microseconds in file:///H:/bzr/5.5/
by Sergei Golubchik 08 Jun '12

08 Jun '12

Hi, Vladislav! On Jun 08, Vladislav Vaintroub wrote: > ------------------------------------------------------------ > revno: 3426 > revision-id: wlad(a)montyprogram.com-20120608000841-ieo4vumio11pc8p9 > parent: wlad(a)montyprogram.com-20120530182054-g7sll9u4gsitvgqe > fixes bug(s): https://launchpad.net/bugs/1008334 > committer: Vladislav Vaintroub <wlad(a)montyprogram.com> > branch nick: 5.5 > timestamp: Fri 2012-06-08 02:08:41 +0200 > message: > LP1008334 : Speedup specific datetime queries that got slower with introduction of microseconds > > - Item::get_seconds() now skips decimal arithmetic, if decimals is 0. This significantly speeds up from_unixtime() if no fractional part is passed. > - replace sprintfs used to format temporal values by hand-coded formatting Looks ok. Would be good to mention the ~25% speedup in the comment above fmt_number. Like "Gives 25% speedup when converting temporal values to strings, as compared to sprintf". So that one wouldn't need to dig up bzr history every time. > === modified file 'sql/item.cc' > --- a/sql/item.cc 2012-05-21 18:54:41 +0000 > +++ b/sql/item.cc 2012-06-08 00:08:41 +0000 > @@ -1265,7 +1265,7 @@ > > bool Item::get_seconds(ulonglong *sec, ulong *sec_part) > { > - if (result_type() == INT_RESULT) > + if (decimals == 0 || result_type() == INT_RESULT) I'd expect that checking for decimals==0 alone should be enough. Could you try to run the test suite with the DBUG_ASSERT(result_type() != INT_RESULT || decimals == 0); please? > { // optimize for an important special case > longlong val= val_int(); > bool neg= val < 0 && !unsigned_flag; Regards, Sergei

1 0

Re: [Maria-developers] [Commits] Rev 3429: MDEV-329: MariaDB 5.5 does not use fdatasync(). in http://bazaar.launchpad.net/~maria-captains/maria/5.5
by Kristian Nielsen 08 Jun '12

08 Jun '12

Hi wlad, Can I get you to review the following one-liner? (Just the Cmake part). The problem is that the code in 5.5 currently does not use fdatasync(), falling back to fsync(). The fdatasync() is detected correctly by cmake, but the HAVE_DECL_FDATASYNC symbol does not get defined so code does not use it. Is adding HAVE_DECL_FDATASYNC to config.h.cmake the correct fix? - Kristian. knielsen(a)knielsen-hq.org writes: > At http://bazaar.launchpad.net/~maria-captains/maria/5.5 > > ------------------------------------------------------------ > revno: 3429 > revision-id: knielsen(a)knielsen-hq.org-20120608091856-jmxb22ehrdp8xjdo > parent: timour(a)askmonty.org-20120606131948-0k4ih4get2fttge0 > committer: knielsen(a)knielsen-hq.org > branch nick: mariadb-5.5 > timestamp: Fri 2012-06-08 11:18:56 +0200 > message: > MDEV-329: MariaDB 5.5 does not use fdatasync(). > > The --debug-no-sync incorrectly defaulted to ON, disabling sync calls > by default which can loose data or cause corruption. Also, the code > used fsync() instead of the sometimes more efficient fdatasync(). > === modified file 'config.h.cmake' > --- a/config.h.cmake 2012-04-19 02:02:28 +0000 > +++ b/config.h.cmake 2012-06-08 09:18:56 +0000 > @@ -150,6 +150,7 @@ > #cmakedefine HAVE_FCNTL 1 > #cmakedefine HAVE_FCONVERT 1 > #cmakedefine HAVE_FDATASYNC 1 > +#cmakedefine HAVE_DECL_FDATASYNC 1 > #cmakedefine HAVE_FESETROUND 1 > #cmakedefine HAVE_FINITE 1 > #cmakedefine HAVE_FP_EXCEPT 1 > > === modified file 'sql/mysqld.cc' > --- a/sql/mysqld.cc 2012-05-21 18:54:41 +0000 > +++ b/sql/mysqld.cc 2012-06-08 09:18:56 +0000 > @@ -6161,7 +6161,7 @@ struct my_option my_long_options[]= > #endif > {"debug-no-sync", 0, > "Disables system sync calls. Only for running tests or debugging!", > - &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, > + &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, > #ifdef HAVE_REPLICATION > {"debug-sporadic-binlog-dump-fail", 0, > "Option used by mysql-test for debugging and testing of replication.", > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

2 2

[Maria-developers] shrink() in sql_string.h
by MARK CALLAGHAN 07 Jun '12

07 Jun '12

Why doesn't the shrink() method in sql_string.h check the value of alloced before calling my_realloc? my_realloc might free Ptr, but when alloced=0 that memory is not owned by the string. 2 bk@work | inline void shrink(uint32 arg_length) // Shrink buffer 2 bk@work | { 2 bk@work | if (arg_length < Alloced_length) 2 bk@work | { 2 bk@work | char *new_ptr; 2 bk@work | if (!(new_ptr=(char*) my_realloc(Ptr,arg_length,MYF(0)))) 2 bk@work | { 228 sasha@m | Alloced_length = 0; 2 bk@work | real_alloc(arg_length); 2 bk@work | } 2 bk@work | else 2 bk@work | { 2 bk@work | Ptr=new_ptr; 2 bk@work | Alloced_length=arg_length; 2 bk@work | } 2 bk@work | } 2 bk@work | } -- Mark Callaghan mdcallag(a)gmail.com

2 2

[Maria-developers] SHOW EXPLAIN: All concurrency problems should be gone, please test
by Sergei Petrunia 07 Jun '12

07 Jun '12

Hi Elena, I've pushed the fix for all known SHOW EXPLAIN problems. I think, another round of testing is needed. You can do it right away, or wait until I resolve the open "different query output" problems. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Please review: [Commits] Rev 3535: Fix for bug lp:1006231 in file:///home/tsk/mprog/src/5.3/
by Sergei Petrunia 01 Jun '12

01 Jun '12

Hi Timour, As discussed on the phone call: - Let's add a separate MDEV item to add "the assert". - Ok to push tis patch. On Wed, May 30, 2012 at 07:12:33PM +0300, Timour Katchaounov wrote: > Sergey, > > Could you please review yet another bug fix for expensive subqueries > executed during optimiziation. > > Timour > > ------------------------------------------------------------ > revno: 3535 > revision-id: timour(a)askmonty.org-20120530161018-kgsiqesmnohtnbc6 > parent: holyfoot(a)askmonty.org-20120529045925-h35akgdit83ql5yq > fixes bug(s): https://launchpad.net/bugs/1006231 > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Wed 2012-05-30 19:10:18 +0300 > message: > Fix for bug lp:1006231 > > Analysis: > > When a subquery that needs a temp table is executed during > the prepare or optimize phase of the outer query, at the end > of the subquery execution all the JOIN_TABs of the subquery > are replaced by a new JOIN_TAB that selects from the temp table. > However that temp table has no corresponding TABLE_LIST. > Once EXPLAIN execution reaches its last phase, it tries to print > the names of the subquery tables through its TABLE_LISTs, but in > the case of this bug there is no such TABLE_LIST (it is NULL), > hence a crash. > > Solution: > The fix is to block subquery evaluation inside > Item_func_like::fix_fields and Item_func_like::select_optimize() > using the Item::is_expensive() test. > === modified file 'mysql-test/r/subselect_innodb.result' > --- a/mysql-test/r/subselect_innodb.result 2012-05-20 12:57:29 +0000 > +++ b/mysql-test/r/subselect_innodb.result 2012-05-30 16:10:18 +0000 > @@ -365,4 +365,19 @@ GROUP BY 1 > MAX( f1 ) > NULL > drop table t1, t2, t3; > +# > +# LP BUG#1006231 crash in select_describe > +# > +create table t1(a1 int) ENGINE=InnoDB; > +insert into t1 values (1); > +explain > +select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1)); > +id select_type table type possible_keys key key_len ref rows Extra > +1 PRIMARY t1 ALL NULL NULL NULL NULL 1 > +2 SUBQUERY t1 ALL NULL NULL NULL NULL 1 > +3 SUBQUERY t1 ALL NULL NULL NULL NULL 1 Using temporary; Using filesort > +select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1)); > +1 > +1 > +drop table t1; > set optimizer_switch=@subselect_innodb_tmp; > > === modified file 'mysql-test/t/subselect_innodb.test' > --- a/mysql-test/t/subselect_innodb.test 2012-05-20 12:57:29 +0000 > +++ b/mysql-test/t/subselect_innodb.test 2012-05-30 16:10:18 +0000 > @@ -356,4 +356,16 @@ WHERE f2 >= ( > > drop table t1, t2, t3; > > +--echo # > +--echo # LP BUG#1006231 crash in select_describe > +--echo # > + > +create table t1(a1 int) ENGINE=InnoDB; > +insert into t1 values (1); > +explain > +select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1)); > +select 1 from t1 where 1 like (select 1 from t1 where 1 <=> (select 1 from t1 group by a1)); > +drop table t1; > + > + > set optimizer_switch=@subselect_innodb_tmp; > > === modified file 'sql/item_cmpfunc.cc' > --- a/sql/item_cmpfunc.cc 2012-05-20 12:57:29 +0000 > +++ b/sql/item_cmpfunc.cc 2012-05-30 16:10:18 +0000 > @@ -4656,7 +4656,7 @@ longlong Item_func_like::val_int() > > Item_func::optimize_type Item_func_like::select_optimize() const > { > - if (args[1]->const_item()) > + if (args[1]->const_item() && !args[1]->is_expensive()) > { > String* res2= args[1]->val_str((String *)&cmp.value2); > const char *ptr2; > @@ -4743,7 +4743,8 @@ bool Item_func_like::fix_fields(THD *thd > We could also do boyer-more for non-const items, but as we would have to > recompute the tables for each row it's not worth it. > */ > - if (args[1]->const_item() && !use_strnxfrm(collation.collation)) > + if (args[1]->const_item() && !use_strnxfrm(collation.collation) && > + !args[1]->is_expensive()) > { > String* res2 = args[1]->val_str(&cmp.value2); > if (!res2) > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] WL#252 New (by DonQuichote): IF (NOT) EXIST clauses for ALTER TABLE
by worklog-noreply＠askmonty.org 01 Jun '12

01 Jun '12

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: IF (NOT) EXIST clauses for ALTER TABLE CREATION DATE..: Fri, 01 Jun 2012, 09:35 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 252 (https://askmonty.org/worklog/?tid=252) VERSION........: WorkLog-4.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: MySQL / MariaDB SQL is great as a functional language: you tell what you want and not how to do it. This includes suppressing of errors when the situation you want already exists. So there is a CREATE TABLE IF NOT EXISTS statement, for example (you say that you want the table to exist, not that it has to be built right now). It would be nice if altering a table could be done the same way: ALTER TABLE SomeTable ADD COLUMN IF NOT EXISTS SomeColumn ... ALTER TABLE SomeTable DROP COLUMN IF EXISTS SomeColumn ... ALTER TABLE SomeTable DROP FOREIGN KEY IF EXISTS SomeConstraint ... This would make definition scripts more legible and more friendly to existing databases. It would facilitate what I call "repeatable scripts", that can both create a new database and update an existing one to the latest structure. Mind you, this is already possible using temporary stored procedures (as shown in http://www.howtoforge.com/node/4833) but it would make definition scripts more maintainable and the SQL language more consistent. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] MariaDB 5.5.24 release prep
by Sergei Golubchik 31 May '12

31 May '12

Hi, Jocelyn! On May 31, Jocelyn Fournier wrote: > > Just to be sure : it means also the debian package will be properly > linked against libaio ? (it wasn't the case in 5.5.23 release). Unfortunately not. I mean that debian packages will be linked against libaio only in 5.5.25, but not in 5.5.24. Currently (in 5.5.24) only RPM packages are linked against libaio. Debian packages and bintar package are not. Regards, Sergei

1 0

Re: [Maria-developers] MariaDB 5.5.24 release prep
by Sergei Golubchik 31 May '12

31 May '12

Hi, md! On May 31, md wrote: > Sergei: > > I guess you can get 5.5.24 to build ok. I had a bunch of trouble with > 5.5.23 and a compiler error that I could not seem to make go away. > > [ 47%] Building CXX object > storage/oqgraph/CMakeFiles/oqgraph.dir/graphcore.cc.o > > In file included from > /usr/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp:27:0, This is a known issue. An the OQGraph engine that we include is incompatible with the new Boost. It is a third-party engine, not ours. OQGraph developer knows about this problem and he's working on it. When he'll fix OQGraph, we will update it in our sources. Meanwhile we build without. Try to run cmake -DWITHOUT_OQGRAPH=1 in your build tree, and run make again. In 5.5.25 I'll make this the default behavior, until OQGraph is fixed. Regards, Sergei

1 0

Re: [Maria-developers] MariaDB 5.5.24 release prep
by Sergei Golubchik 31 May '12

31 May '12

Hi, Jocelyn! On May 31, Jocelyn Fournier wrote: > > Just wondering if the build issue with binaries and packages which don't > use native AIO is fixed as well ? > > (See https://bugs.launchpad.net/maria/+bug/988204 ) Doesn't seem so :( For some reason it was submitted in the wrong bugtracker, and I missed it when preparing a release. Sorry for this, it'll be in 5.5.25. This time - for sure. Note that 5.5 RPM packages are not affected by this bug - they are all properly linked with AIO. Regards, Sergei

1 0

[Maria-developers] MariaDB 5.5.24 release prep
by Daniel Bartholomew 31 May '12

31 May '12

All, I'm uploading the files for MariaDB 5.5.24 and getting other bits and pieces ready. Preliminary versions of the Release Notes and Changelog are available here: http://kb.askmonty.org/en/mariadb-5524-release-notes/ http://kb.askmonty.org/en/mariadb-5524-changelog/ The big news in this release is the new RPM packages and the YUM repositories. I'm still working on getting all the various bits set up, but it's all coming together and with any luck, I should be able to flip the switch and announce the release tomorrow morning (U.S. Eastern Time). In the mean time, if there is anything which should be mentioned in the Release Notes, please let me know ASAP or jump in and edit the Release Notes directly. Thanks! -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] Support of the extended syntax for ANALYZE
by Sergei Golubchik 26 May '12

26 May '12

Hi, Igor! On May 10, Igor Babaev wrote: > Serg, > > Here's the patch we talked about on IRC today. ... > +ANALYZE TABLE t1(COLUMN(), INDEX()); > +ANALYZE TABLE t1(COLUMN(c,e,b), INDEX(idx2,idx4)); > +ANALYZE TABLE t1(COLUMN(*), INDEX(*)); I see what you want to do. I think it'll be more SQL-like, if it'll be more verbose, for example ANALYZE TABLE t1 FOR COLUMNS (c,e,d) INDEXES (idx2, idx4); I would prefer to drop parentheses too, but then the grammar will become ambiguous :( And instead of double (*) it could simply be ANALYZE TABLE t1 FULL; or ALL; it'd be similar to CHECK TABLE t1 EXTENDED; REPAIR TABLE t1 QUICK; etc Alternatively, it could have an explicit "PERSISTENT" keyword: ANALYZE TABLE t1 PERSISTENT; -- meaning all columns and indexes ANALYZE TABLE t1 PERSISTENT FOR COLUMNS (c,e,d) INDEXES (idx2, idx4); That's probably the best one. Reasonably SQL-like. And the most common use case (analyze all) is short, it's clearly the main, default behavior. And the clause to specify columns and indexes extends the default syntax. Regards, Sergei

4 6

[Maria-developers] SHOW EXPLAIN and LOCK_thd_data
by Sergei Petrunia 26 May '12

26 May '12

Hi Sergei, I've got a problem with SHOW EXPLAIN and LOCK_thd_data. SHOW EXPLAIN was modeled after the KILL command: it's actions are: lock LOCK_thread_count; find the thread $target_thr we need explain for; lock $target_thr->LOCK_thread_count; unlock LOCK_thread_count; send SHOW EXPLAIN request to $target_thr. wait until request is executed (or discarded) unlock $target_thr->LOCK_thread_count; This scheme works, as long as the target thread doesn't select from information_schema tables. With queries over I_S tables, it breaks, because I_S table may try to acquire current_thd->LOCK_thread_count during execution. Below I provide a stacktrace of one such case, line numbers are from lp:~maria-captains/maria/5.5-show-explain. My first thought was to change LOCK_thread_count to be a read/write mutex, but I wanted to hear your opinion, too. (gdb) wher #0 inline_mysql_mutex_lock (that=0xa1111d4, src_file=0x894b75c "sql/sql_class.h", src_line=3020) at include/mysql/psi/mysql_thread.h:608 #1 0x081dda85 in THD::set_open_tables (this=0xa1104b0, open_tables_arg=0xa12de10) at sql/sql_class.h:3020 #2 0x081d9024 in open_table (thd=0xa1104b0, table_list=0xa1289b0, mem_root=0x99134000, ot_ctx=0x99134020) at sql/sql_base.cc:3180 #3 0x081d9aee in open_and_process_table (thd=0xa1104b0, lex=0x9913417c, tables=0xa1289b0, counter=0x991340bc, flags=1026, prelocking_strategy=0x991340c0, has_prelocking_list=false, ot_ctx=0x99134020, new_frm_mem=0x99134000) at sql/sql_base.cc:4509 #4 0x081da269 in open_tables (thd=0xa1104b0, start=0x991340d4, counter=0x991340bc, flags=1026, prelocking_strategy=0x991340c0) at sql/sql_base.cc:4958 #5 0x081da6de in open_normal_and_derived_tables (thd=0xa1104b0, tables=0xa1289b0, flags=1026, dt_phases=34) at sql/sql_base.cc:5617 #6 0x082a3e23 in fill_schema_table_by_open (thd=0xa1104b0, is_show_fields_or_keys=true, table=0xa1263c0, schema_table=0x8c262b0, orig_db_name=0x99134e04, orig_table_name=0x99134e1c, open_tables_state_backup=0x99134d94, can_deadlock=false) at sql/sql_show.cc:3659 #7 0x082b8638 in get_all_tables (thd=0xa1104b0, tables=0xa11d560, cond=0x0) at sql/sql_show.cc:4214 #8 0x0829f943 in do_fill_table (thd=0xa1104b0, table_list=0xa11d560, join_table=0xa128548) at sql/sql_show.cc:7503 #9 0x0829fce2 in get_schema_tables_result (join=0xa1279a8, executed_place=PROCESSED_BY_JOIN_EXEC) at sql/sql_show.cc:7610 #10 0x0829468d in JOIN::exec_inner (this=0xa1279a8) at sql/sql_select.cc:2354 #11 0x082931c8 in JOIN::exec (this=0xa1279a8) at sql/sql_select.cc:2201 BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] Please review: [Commits] Rev 3405: Test case for bug lp:1001117, MySQL BUG#12330344 in file:///home/tsk/mprog/src/5.5-lpb944706/
by Sergei Petrunia 24 May '12

24 May '12

Hi Timour, On Thu, May 24, 2012 at 02:12:12PM +0300, Timour Katchaounov wrote: > Sergey, > > Could you please review the following patch. So far it is only in my > tree for bug lp:944706 (because this tree already fixes the problem as > explained below). > Ok to push. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] MDEV-83: pushdown of expensive predicates
by Sergei Petrunia 21 May '12

21 May '12

Hi Timour, Some thoughts about MDEV-83. The jira entry says: > The main difference in these two plans is that with the first execution plan > the dependent subquery: ... is evaluated before the table part is accessed > while many rows where (p_name like 'forest%') is not true are filtered out > and evaluation of the dependent subquery is not needed for them. The way I read this, the only way one could figure out that the subquery should be evaluated at later phase (after table part) is to figure out that selectivity of table `part`, together with its condition of p_name like 'forest%' is less than one. That way, subquery is evaluated fewer times, and query execution will be cheaper. I don't see any index that covers p_name column. This means that current optimizer has no clue about selectivity of conditions over p_name column, and hence is unable to make the correct decision. If I add an index on p_name, then I get a different query plan (I didn't check if is slower or faster than the original). I think, one of the first things this MDEV needs is to figure out how exactly we will get selectivities for non-indexed columns. If we get them, and start to take them into account in join optimizer(*), the example provided in this MDEV/ bug may just go away :-). The general problem will remain, though. (*) { Currently, the optimizer has "quick_condition_rows", which may cause join fanout to be less than 1 (check out examples with EXPLAIN EXTENDED and filtered != 100% in the testsuite). The problem is that quick_condition_rows is not used consistently for all ways to access the table, for example it is not taken into account when considering ref access. I do not know whether Igor's work in best_access_path() includes making it consistently make use of quick_condition_rows estimates. } == Subquery predicate attachment considerations == Some thoughts about the problem. There are three factors we may want/need to take into account when attaching subquery predicate to some join_tab: 1. Fanout of join tabs 2. Cost of the subquery predicate evaluation 3. Selectivity of the subquery predicate. The example used in this MDEV item can be resolved by taking into account #1 and #2. For the first step, we only need to know - accurate join tab fanout (#1), - that subquery predicate evaluation has some cost ( #2 != 0) these two allow us to set/resolve a task of attaching the subquery predicate to the join_tab where total cost of its evaluations is minimized. The exact value of subquery evaluation cost is irrelevant. It will only become relevant when/if we start to make a choice between evaluating subquery predicate, or preforming join with the next join_tab. In order for that choice to be meaningful, we will need to have an idea about subquery predicate's selectivity. That way, we will be able to make a choice between 1. evaluate subquery, then make join with next join tab cost(subquery_pred) + selectivity(subquery_pred) * cost(join_tab) and 2. make join with next join_tab, then evaluate the subquery: cost(join_tab) + selectivity(join_tab) * cost(join_tab) BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] MDEV-136 Non-blocking "set read_only"
by Sergei Golubchik 20 May '12

20 May '12

Hi, Holyfoot! Looks good to me! See a couple of comments below. Please push after fixing all that. On May 17, holyfoot(a)askmonty.org wrote: > ------------------------------------------------------------ > revno: 3518 > revision-id: holyfoot(a)askmonty.org-20120517131405-y12erfkgta2ym2pn > parent: sanja(a)montyprogram.com-20120507181437-1zl1v1uxje7v6994 > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-136 > timestamp: Thu 2012-05-17 18:14:05 +0500 > message: > MDEV-136 Non-blocking "set read_only". > Handle the 'set read_only=1' in lighter way, than the FLUSH TABLES READ LOCK; > For the transactional engines we don't wait for operations on that tables to finish. > > === modified file 'mysql-test/t/read_only_innodb.test' > --- a/mysql-test/t/read_only_innodb.test 2008-04-08 05:20:58 +0000 > +++ b/mysql-test/t/read_only_innodb.test 2012-05-17 13:14:05 +0000 > @@ -75,7 +75,28 @@ > SELECT * FROM t1; > COMMIT; > > -connection default; > +# > +# Tests that LOCK TABLE doesn't block the SET READ_ONLY=1 for the InnoDB tables > +# > +connection default; > +UNLOCK TABLES; > + > +--echo connection con1; > +connection con1; > +lock table t1 write; See whether you can directly test that the table was not reopened. Perhaps by examining the corresponding SHOW STATUS variables you could do that. > + > +--echo connection default; > +connection default; > +set global read_only=1; > + > +--echo connection con1; > +connection con1; > +unlock tables; > + > +--echo connection default; > +connection default; > +SET GLOBAL read_only=0; > + > UNLOCK TABLES; > DROP TABLE t1; > DROP USER test@localhost; > === modified file 'sql/sql_base.cc' > --- a/sql/sql_base.cc 2012-04-19 06:16:30 +0000 > +++ b/sql/sql_base.cc 2012-05-17 13:14:05 +0000 > @@ -933,7 +938,14 @@ > for (uint idx=0 ; idx < open_cache.records ; idx++) > { > TABLE *table=(TABLE*) hash_element(&open_cache,idx); > - if (table->in_use) > + /* We don't increment the refresh_version when set_readonly_mode, */ > + /* but we still need non-transactional tables to be reopened. */ > + /* So we set their versions as 'refresh_version - 1', which marks */ > + /* them for the 'needs_reopen_or_table_lock()' */ please, use the standard mysql comment style as you can see everywhere in the sources > + if (set_readonly_mode && !table->file->has_transactions()) > + table->s->version= refresh_version-1; better set it to 0, that's what tdc_remove_table() does. And we won't need to think about possible race conditions. > + if (table->in_use && > + (!set_readonly_mode || !table->file->has_transactions())) > table->in_use->some_tables_deleted= 1; > } > } Regards, Sergei

1 0

[Maria-developers] On the DBUG_ASSERT in create_ref_for_key()
by Sergei Petrunia 20 May '12

20 May '12

Hi Sergei, Re the DBUG_ASSERT(length > 0 && keyparts != 0); line in create_ref_for_key() in 5.3: I've looked - the assert can be commented out, because it's valid to have length=0 && !keyparts for a variant of LooseScan algorithm. Some more details: I've tried to come up another assert statement, that would allow length==0 only when LooseScan is used. Unfortunately, it is not easy - the query plan is encoded in join->best_positions, while create_ref_for_key() has access only to the JOIN_TAB. Since SJ-Materialization, the query plan is represented with multiple JOIN_TAB arrays, while there is only one POSITION array, which means that one needs to loop to find the POSITION which corresponds to the JOIN_TAB. EXPLAIN and execution use JOIN_TAB::loosescan_match_tab, but it is set by setup_semijoin_dups_elimination() which is invoked after create_ref_for_key() is. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] MDEV-225: Replace with dummy events an event that is not understood by a slave to which it should be sent
by Sergei Golubchik 19 May '12

19 May '12

Hi, Kristian! On Apr 27, knielsen(a)knielsen-hq.org wrote: > revno: 3368 > revision-id: knielsen(a)knielsen-hq.org-20120427082038-frqt8ykqy77x3r8e > parent: sergii(a)pisem.net-20120410063020-fm6a5ds0iggihq02 > committer: knielsen(a)knielsen-hq.org > branch nick: work-5.5-mdev225 > timestamp: Fri 2012-04-27 10:20:38 +0200 > message: > MDEV-225: Replace with dummy events an event that is not understood > by a slave to which it should be sent > > Add function to replace arbitrary event with dummy event. > > Add code which uses this to fix the bug that enabling row_annotate > events on the master breaks slaves which do not request such events. > > Add that slaves set a variable @mariadb_slave_capability to inform > the master in a robust way about which events it can, and cannot, > handle. I'm not sure I like the idea of magic user variables. Why wouldn't you create a session server variable @@mariadb_slave_capability? Also: Why would "a later release of a slave change what an earlier release of a master believes about its capabilities"? See comments to the code below. > === added file 'mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test' > --- a/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test 1970-01-01 00:00:00 +0000 > +++ b/mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test 2012-04-27 08:20:38 +0000 > @@ -0,0 +1,96 @@ > +--source include/master-slave.inc > +--source include/have_debug.inc > +--source include/have_binlog_format_row.inc > + > +connection master; > + > +set @old_master_binlog_checksum= @@global.binlog_checksum; > +CREATE TABLE t1 (a INT PRIMARY KEY); > +INSERT INTO t1 VALUES (0); > + > +sync_slave_with_master; > +connection slave; > + > +--echo # Test slave with no capability gets dummy event, which is ignored. > +--source include/stop_slave.inc > +SET @@global.debug_dbug='d,simulate_slave_capability_none'; Don't do that please, it'll stop any debug trace for ./mtr --debug. Instead, write SET @@global.debug_dbug='+d,simulate_slave_capability_old_53'; ... your tests SET @@global.debug_dbug='-d,simulate_slave_capability_old_53'; or SET @debug_old=@@global.debug_dbug; SET @@global.debug_dbug='+d,simulate_slave_capability_old_53'; ... your tests SET @@global.debug_dbug=@debug_old; > +--source include/start_slave.inc > +connection master; > +sync_slave_with_master; > +connection slave; > +let $relaylog_start= query_get_value(SHOW SLAVE STATUS, Relay_Log_Pos, 1); > + > +connection master; > +SET SESSION binlog_annotate_row_events = ON; > +let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); > +let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); > +# A short event, to test when we need to use user_var_event for dummy event. ... > === modified file 'sql/log_event.cc' > --- a/sql/log_event.cc 2012-04-10 06:28:13 +0000 > +++ b/sql/log_event.cc 2012-04-27 08:20:38 +0000 > @@ -3277,6 +3277,114 @@ Query_log_event::Query_log_event(const c > } > > > +/* > + Replace a binlog event read into a packet with a dummy event. Either a > + Query_log_event that has just a comment, or if that will not fit in the > + space used for the event to be replaced, then a NULL user_var event. > + > + This is used when sending binlog data to a slave which does not understand > + this particular event and which is too old to support informational events > + or holes in the event stream. > + > + This allows to write such events into the binlog on the master and still be > + able to replicate against old slaves without them breaking. > + > + Clears the flag LOG_EVENT_THREAD_SPECIFIC_F and set LOG_EVENT_SUPPRESS_USE_F. > + Overwrites the type with QUERY_EVENT (or USER_VAR_EVENT), and replaces the > + body with a minimal query / NULL user var. > + > + Returns zero on success, -1 if error due to too little space in original > + event. A minimum of 25 bytes (19 bytes fixed header + 6 bytes in the body) > + is needed in any event to be replaced with a dummy event. > +*/ > +int > +Query_log_event::dummy_event(String *packet, ulong ev_offset, > + uint8 checksum_alg) > +{ > + uchar *p= (uchar *)packet->ptr() + ev_offset; > + size_t data_len= packet->length() - ev_offset; > + uint16 flags; > + static const size_t min_user_var_event_len= > + LOG_EVENT_HEADER_LEN + UV_NAME_LEN_SIZE + 1 + UV_VAL_IS_NULL; // 25 > + static const size_t min_query_event_len= > + LOG_EVENT_HEADER_LEN + QUERY_HEADER_LEN + 1 + 1; // 34 > + > + if (checksum_alg == BINLOG_CHECKSUM_ALG_CRC32) > + data_len-= BINLOG_CHECKSUM_LEN; > + else > + DBUG_ASSERT(checksum_alg == BINLOG_CHECKSUM_ALG_UNDEF || > + checksum_alg == BINLOG_CHECKSUM_ALG_OFF); > + > + if (data_len < min_user_var_event_len) > + /* Cannot replace with dummy, event too short. */ > + return -1; > + > + flags= uint2korr(p + FLAGS_OFFSET); > + flags&= ~LOG_EVENT_THREAD_SPECIFIC_F; > + flags|= LOG_EVENT_SUPPRESS_USE_F; > + int2store(p + FLAGS_OFFSET, flags); > + > + if (data_len < min_query_event_len) > + { > + /* > + Have to use dummy user_var event for such a short packet. > + > + This works, but the event will be considered part of an event group with > + the following event, so things like START SLAVE UNTIL may behave slightly > + unexpected. Why? > + > + We write a NULL user var with the name @`!dummyvar` (or as much > + as that as will fit within the size of the original event - so > + possibly just @`!`). > + */ > + static const char var_name[]= "!dummyvar"; > + uint name_len= data_len - (min_user_var_event_len - 1); > + > + p[EVENT_TYPE_OFFSET]= USER_VAR_EVENT; > + int4store(p + LOG_EVENT_HEADER_LEN, name_len); > + memcpy(p + LOG_EVENT_HEADER_LEN + UV_NAME_LEN_SIZE, var_name, name_len); > + p[LOG_EVENT_HEADER_LEN + UV_NAME_LEN_SIZE + name_len]= 1; // indicates NULL > + } > + else > + { > + /* > + Use a dummy query event, just a comment. > + */ > + static const char message[]= > + "# Dummy event replacing event type %u that slave cannot handle."; > + char buf[sizeof(message)+1]; /* +1, as %u can expand to 3 digits. */ > + uchar old_type= p[EVENT_TYPE_OFFSET]; > + uchar *q= p + LOG_EVENT_HEADER_LEN; > + size_t comment_len, len; > + > + p[EVENT_TYPE_OFFSET]= QUERY_EVENT; > + int4store(q + Q_THREAD_ID_OFFSET, 0); > + int4store(q + Q_EXEC_TIME_OFFSET, 0); > + q[Q_DB_LEN_OFFSET]= 0; > + int2store(q + Q_ERR_CODE_OFFSET, 0); > + int2store(q + Q_STATUS_VARS_LEN_OFFSET, 0); > + q[Q_DATA_OFFSET]= 0; /* Zero terminator for empty db */ > + q+= Q_DATA_OFFSET + 1; > + len= my_snprintf(buf, sizeof(buf), message, old_type); > + comment_len= data_len - (min_query_event_len - 1); > + if (comment_len <= len) > + memcpy(q, buf, comment_len); > + else > + { > + memcpy(q, buf, len); > + memset(q+len, ' ', comment_len - len); > + } > + } > + > + if (checksum_alg == BINLOG_CHECKSUM_ALG_CRC32) > + { > + ha_checksum crc= my_checksum(0L, p, data_len); > + int4store(p + data_len, crc); > + } > + return 0; > +} > + > + > #ifdef MYSQL_CLIENT > /** > Query_log_event::print(). > === modified file 'sql/log_event.h' > --- a/sql/log_event.h 2012-04-10 06:28:13 +0000 > +++ b/sql/log_event.h 2012-04-27 08:20:38 +0000 > @@ -566,6 +566,43 @@ enum enum_binlog_checksum_alg { > #define BINLOG_CHECKSUM_LEN CHECKSUM_CRC32_SIGNATURE_LEN > #define BINLOG_CHECKSUM_ALG_DESC_LEN 1 /* 1 byte checksum alg descriptor */ > > +/* > + These are cabability numbers for MariaDB slave servers. Typo. capability. > + > + Newer MariaDB slaves set this to inform the master about their capabilities. > + This allows the master to decide which events it can send to the slave > + without breaking replication on old slaves that maybe do not understand > + all events from newer masters. > + > + As new releases are backwards compatible, a given capability implies also > + all capabilities with smaller number. > + > + Older MariaDB slaves and other MySQL slave servers do not set this, so they > + are recorded with capability 0. > +*/ > + > +/* MySQL or old MariaDB slave with no announced capability. */ > +#define MARIA_SLAVE_CAPABILITY_UNKNOWN 0 > +/* MariaDB >= 5.3, which understands ANNOTATE_ROWS_EVENT. */ > +#define MARIA_SLAVE_CAPABILITY_ANNOTATE 1 > +/* > + MariaDB >= 5.5. This version has the capability to tolerate events omitted > + from the binlog stream without breaking replication (MySQL slaves fail > + because they mis-compute the offsets into the master's binlog). > +*/ > +#define MARIA_SLAVE_CAPABILITY_TOLERATE_HOLES 2 > +/* MariaDB > 5.5, which knows about binlog_checkpoint_log_event. */ > +#define MARIA_SLAVE_CAPABILITY_BINLOG_CHECKPOINT 3 > +/* > + MariaDB server which understands MySQL 5.6 ignorable events. This server > + can tolerate receiving any event with the LOG_EVENT_IGNORABLE_F flag set. > +*/ > +#define MARIA_SLAVE_CAPABILITY_IGNORABLE 4 > + > +/* Our capability. */ > +#define MARIA_SLAVE_CAPABILITY_MINE MARIA_SLAVE_CAPABILITY_BINLOG_CHECKPOINT > + > + > /** > @enum Log_event_type > > === modified file 'sql/slave.cc' > --- a/sql/slave.cc 2012-04-10 06:28:13 +0000 > +++ b/sql/slave.cc 2012-04-27 08:20:38 +0000 > @@ -1747,6 +1747,37 @@ past_checksum: > } > } > } > + > + /* Announce MariaDB slave capabilities. */ > + DBUG_EXECUTE_IF("simulate_slave_capability_none", goto after_set_cabability;); > + { > + int rc= DBUG_EVALUATE_IF("simulate_slave_capability_old_53", > + mysql_real_query(mysql, STRING_WITH_LEN("SET @mariadb_slave_capability=" > + STRINGIFY_ARG(MARIA_SLAVE_CAPABILITY_ANNOTATE))), > + mysql_real_query(mysql, STRING_WITH_LEN("SET @mariadb_slave_capability=" > + STRINGIFY_ARG(MARIA_SLAVE_CAPABILITY_MINE)))); Better put DBUG_EVALUATE_IF only around the STRINGIFY_ARG values: DBUG_EVALUATE_IF("...", STRINGIFY_ARG(...), STRINGIFY_ARG(...)) so that next time I (or somebody) wouldn't need to vdiff two long function calls, trying to count parentheses and commans :) > + if (rc) > + { > + err_code= mysql_errno(mysql); > + if (is_network_error(err_code)) > + { > + mi->report(ERROR_LEVEL, err_code, > + "Setting @mariadb_slave_capability failed with error: %s", > + mysql_error(mysql)); > + goto network_err; > + } > + else > + { > + /* Fatal error */ > + errmsg= "The slave I/O thread stops because a fatal error is " > + "encountered when it tries to set @mariadb_slave_capability."; > + sprintf(err_buff, "%s Error: %s", errmsg, mysql_error(mysql)); > + goto err; > + } > + } > + } > +after_set_cabability: > + > err: > if (errmsg) > { > === modified file 'sql/sql_repl.cc' > --- a/sql/sql_repl.cc 2012-03-28 17:26:00 +0000 > +++ b/sql/sql_repl.cc 2012-04-27 08:20:38 +0000 > @@ -563,14 +584,44 @@ static int send_heartbeat_event(NET* net > static const char * > send_event_to_slave(THD *thd, NET *net, String* const packet, ushort flags, > Log_event_type event_type, char *log_file_name, > - IO_CACHE *log) > + IO_CACHE *log, int mariadb_slave_capability, > + ulong ev_offset, uint8 current_checksum_alg) current_checksum_alg is part of THD, why do you bother to pass is separately? > { > my_off_t pos; > > /* Do not send annotate_rows events unless slave requested it. */ > - if (event_type == ANNOTATE_ROWS_EVENT && > - !(flags & BINLOG_SEND_ANNOTATE_ROWS_EVENT)) > - return NULL; > + if (event_type == ANNOTATE_ROWS_EVENT && !(flags & BINLOG_SEND_ANNOTATE_ROWS_EVENT)) > + { > + if (mariadb_slave_capability >= MARIA_SLAVE_CAPABILITY_TOLERATE_HOLES) > + { > + /* This slave can tolerate events omitted from the binlog stream. */ > + return NULL; > + } > + else if (mariadb_slave_capability >= MARIA_SLAVE_CAPABILITY_ANNOTATE) > + { > + /* > + The slave did not request ANNOTATE_ROWS_EVENT (it does not need them as > + it will not log them in its own binary log). However, it understands the > + event and will just ignore it, and it would break if we omitted it, > + leaving a hole in the binlog stream. So just send the event as-is. > + */ > + } > + else > + { > + /* > + The slave does not understand ANNOTATE_ROWS_EVENT. > + > + Older MariaDB slaves (and MySQL slaves) will break replication if there > + are holes in the binlog stream (they will miscompute the binlog offset > + and request the wrong position when reconnecting). > + > + So replace the event with a dummy event of the same size that will be > + a no-operation on the slave. > + */ > + if (Query_log_event::dummy_event(packet, ev_offset, current_checksum_alg)) > + return "Failed to replace row annotate event with dummy: too small event."; No ER_xxx error message for that? > + } > + } > > /* > Skip events with the @@skip_replication flag set, if slave requested Regards, Sergei

3 5

[Maria-developers] BUG#1001117: a problem with constants.
by Sergei Petrunia 18 May '12

18 May '12

Hi Timour, In regular maria-5.5, I get: (gdb) wher 1 #0 Item_func_like::select_optimize (this=0xa11c478) at /home/psergey/dev2/5.5-look7/sql/item_cmpfunc.cc:4739 (More stack frames follow...) (gdb) p args[1] $123 = (Item_singlerow_subselect *) 0xa1194a0 (gdb) p args[1]->used_tables() $124 = 0 (gdb) p args[1]->const_item() $125 = true In 5.5-timour tree, I get: #1 0x0841a035 in Item_func_like::select_optimize (this=0xa109820) at /home/psergey/dev2/5.5-timour/sql/item_cmpfunc.cc:4739 (gdb) p args[1] $47 = (Item_singlerow_subselect *) 0xa106848 (gdb) p args[1]->used_tables() $49 = 0 (gdb) p args[1]->const_item() $51 = false I also put a breakpoint in JOIN::get_examined_rows(), it is never hit. Can you explain this effect? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] MDEV-136 Non-blocking "set read_only"
by Sergei Golubchik 17 May '12

17 May '12

Hi, Holyfoot! On May 09, holyfoot(a)askmonty.org wrote: > ------------------------------------------------------------ > revno: 3518 > revision-id: holyfoot(a)askmonty.org-20120509185945-i1yx6d38phgoqzes > parent: sanja(a)montyprogram.com-20120507181437-1zl1v1uxje7v6994 > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-136 > timestamp: Wed 2012-05-09 23:59:45 +0500 > message: > MDEV-136 Non-blocking "set read_only". > Handle the 'set read_only=1' in lighter way, than the FLUSH TABLES READ LOCK; > For the transactional engines we don't wait for operations on that tables to finish. See my comments below. > === modified file 'mysql-test/r/read_only.result' > --- a/mysql-test/r/read_only.result 2009-03-06 14:56:17 +0000 > +++ b/mysql-test/r/read_only.result 2012-05-09 18:59:45 +0000 > @@ -59,7 +59,7 @@ > connection con1; > select @@global.read_only; > @@global.read_only > -0 > +1 This is prone to race conditions. Please, fix the test to remove "send" here and below. (assuming the new result is correct) But is it correct ? Why set read_only is not blocked by a write locked myisam table? > unlock tables ; > select @@global.read_only; > @@global.read_only > @@ -80,7 +80,7 @@ > connection con1; > select @@global.read_only; > @@global.read_only > -0 > +1 > unlock tables ; > select @@global.read_only; > @@global.read_only Where are the tests for the changed functionality? > === modified file 'sql/sql_base.cc' > --- a/sql/sql_base.cc 2012-04-19 06:16:30 +0000 > +++ b/sql/sql_base.cc 2012-05-09 18:59:45 +0000 > @@ -933,7 +938,8 @@ > for (uint idx=0 ; idx < open_cache.records ; idx++) > { > TABLE *table=(TABLE*) hash_element(&open_cache,idx); > - if (table->in_use) > + if (table->in_use && > + (!set_readonly_mode || !table->file->has_transactions())) I wonder how this could work. The line below sets a flag *on a thread*. The task description tells "not wait for transactional tables", while your change means "not set a flag if all tables used in a thread are transactional". That is, if a thread uses both transactional and non-transactional tables, your change does nothing. Back to my first question - where are the tests for this new task? > table->in_use->some_tables_deleted= 1; > } > } Regards, Sergei

3 6

Re: [Maria-developers] Review request for: [Commits] Rev 3403: Fix for bug lp:944706, task MDEV-193 in file:///home/tsk/mprog/src/5.5-lpb944706/
by Sergei Petrunia 17 May '12

17 May '12

On Mon, May 14, 2012 at 11:22:52PM +0300, Timour Katchaounov wrote: > > > /** > > > + Estimate the number of rows that query execution will read. > > > + > > > + @todo This is a very pessimistic upper bound. Use join selectivity > > > + when available to produce a more realistic number. > > > +*/ > > > + > > > +double JOIN::get_examined_rows() > > > +{ > > > + /* Each constant table examines one row, and the result is at most one row. */ > > > + ha_rows examined_rows= const_tables; > > > + uint i= const_tables; > > > + double prev_fanout; > > > + > > > + if (table_count == const_tables) > > > + return examined_rows; > > > + > > > + examined_rows+= join_tab[i++].get_examined_rows(); > > > + for (; i < table_count ; i++) > > > + { > > > + if (join_tab[i].type == JT_EQ_REF) > > > + prev_fanout= 1; > > > + else > > > + prev_fanout= best_positions[i-1].records_read; > > This looks wrong. Declaration of POSITION::records_read has this comment: > > /* > The "fanout": number of output rows that will be produced (after > pushed down selection condition is applied) per each row combination of > previous tables. > */ > > note the "PER EACH ROW COMBINATION .." part. I would expect that this function > would calculate a product of records_read values. > > timour: > > In this function we want to estimate how many rows will be *examined*, not > produced by each JOIN operator. For the estimate I assume a simple nested loops > model, where the JOIN read every row of its right table as many times as many > rows there are in the left operand. The partial join that serves as left > operand, contains records_read rows. This is the multiplier of the number of > rows that will be examined in the right table. > > Of course, for each partial join the join condition will filter a subset of > these rows. > > I agree that blocking algorithms may examine a lot less rows, but it doesn't > make sense to have a very tight bound here. We use an upper bound, because it > is better to miss some constant optimizations, rather than execute very > expensive subqueries here. I was talking about something much more simpler than that. Consider this example: create table ten (a int); insert into ten values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table one_k (a int); insert into one_k select A.a + 10*B.a + 100*C.a from ten A, ten B, ten C; create table ti1 ( a int); insert into ti1 select a from ten limit 4; alter table ti1 add b int; create table ti2 (a int primary key, b int); create table ti3 (a int primary key, b int); insert into ti2 select a, a from one_k; insert into ti3 select a, a from one_k; MariaDB [test]> explain select * from ten where 3 in (select ti2.b + ti3.b from ti1, ti2, ti3 where ti2.a=ti1.a and ti3.a=ti1.a) or a <5; +------+--------------------+-------+--------+---------------+---------+---------+------------+------+-------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +------+--------------------+-------+--------+---------------+---------+---------+------------+------+-------------+ | 1 | PRIMARY | ten | ALL | NULL | NULL | NULL | NULL | 10 | Using where | | 2 | DEPENDENT SUBQUERY | ti1 | ALL | NULL | NULL | NULL | NULL | 4 | Using where | | 2 | DEPENDENT SUBQUERY | ti3 | eq_ref | PRIMARY | PRIMARY | 4 | test.ti1.a | 1 | | | 2 | DEPENDENT SUBQUERY | ti2 | eq_ref | PRIMARY | PRIMARY | 4 | test.ti1.a | 1 | Using where | +------+--------------------+-------+--------+---------------+---------+---------+------------+------+-------------+ For this example, JOIN::get_examined_rows() produces 6. The number comes from 4 rows examined in table ti1 (correct) 1 row examined in table ti2 (incorrect, should be 4) 1 row examined in table ti3 (incorrect, should be 4) Do you agree that the number of 6 is incorrect and needs to be fixed? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] KB Question: Check constraints support
by Daniel Bartholomew 15 May '12

15 May '12

The following question has been posted to the Knowledgebase: http://kb.askmonty.org/en/check-constraints-support - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check constraints support Hi, I have been looking in JIRA, opened bugs, etc. But haven't been able to find an answer. Are check constraints going to be supported? Because they give me the opportunity to give more consistency to my Database, and avoid problems of corruption. The mysql bug is this: http://bugs.mysql.com/bug.php?id=3464 Has been 8 years abandoned, and I expect that you don't do the same, Thank you in advance, txomon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] Review request for: [Commits] Rev 3403: Fix for bug lp:944706, task MDEV-193 in file:///home/tsk/mprog/src/5.5-lpb944706/
by Sergei Petrunia 14 May '12

14 May '12

On Sun, May 13, 2012 at 02:11:15PM +0300, Timour Katchaounov wrote: > Sergey, > > At the optimizer call this Tuesday Igor suggested that you > should review the patch for this bug. The commit message > contains a description of the patch. Let me know if you believe > a more detailed description is needed. > > The patch is also pushed into the following tree: > lp:~maria-captains/maria/5.5-timour > > > Thanks, > Timour > > ------------------------------------------------------------ > revno: 3403 > revision-id: timour(a)askmonty.org-20120511152503-zbjewctjclx0sajt > parent: knielsen(a)knielsen-hq.org-20120508122744-v5okh33kuolot3kb > fixes bug(s): https://launchpad.net/bugs/944706 > committer: timour(a)askmonty.org > branch nick: 5.5-lpb944706 > timestamp: Fri 2012-05-11 18:25:03 +0300 > message: > Fix for bug lp:944706, task MDEV-193 > > The patch enables back constant subquery execution during > query optimization after it was disabled during the development > of MWL#89 (cost-based choice of IN-TO-EXISTS vs MATERIALIZATION). > > The main idea is that constant subqueries are allowed to be executed > during optimization if their execution is not expensive. > > The approach is as follows: > - Constant subqueries are recursively optimized in the beginning of > JOIN::optimize of the outer query. This is done by the new method > JOIN::optimize_constant_subqueries(). This is done so that the cost > of executing these queries can be estimated. > - Optimization of the outer query proceeds normally. During this phase > the optimizer may request execution of non-expensive constant subqueries. > Each place where the optimizer may potentially execute an expensive > expression is guarded with the predicate Item::is_expensive(). > - The implementation of Item_subselect::is_expensive has been extended > to use the number of examined rows (estimated by the optimizer) as a > way to determine whether the subquery is expensive or not. > - The new system variable "expensive_subquery_limit" controls how many > examined rows are considered to be not expensive. The default is 100. > > In addition, multiple changes were needed to make this solution work > in the light of the changes made by MWL#89. These changes were needed > to fix various crashes and wrong results, and legacy bugs discovered > during development. > === modified file 'mysql-test/r/explain.result' > --- a/mysql-test/r/explain.result 2012-01-13 14:50:02 +0000 > +++ b/mysql-test/r/explain.result 2012-05-11 15:25:03 +0000 > @@ -260,7 +260,7 @@ FLUSH TABLES; > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT 1 FROM t1 t JOIN t2 WHERE b <= 1 AND t.a); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > DROP TABLE t1, t2; > # > # Bug #48573: difference of index selection between rpm binary and > @@ -287,7 +287,7 @@ WHERE t1.f1 GROUP BY t1.f1)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 2 SUBQUERY a system NULL NULL NULL NULL 1 > -2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 Using where > +2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 > PREPARE stmt FROM > 'EXPLAIN SELECT 1 FROM t1 > WHERE 1 > ALL((SELECT t1.f1 FROM t1 RIGHT OUTER JOIN t1 a > @@ -297,12 +297,12 @@ EXECUTE stmt; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 2 SUBQUERY a system NULL NULL NULL NULL 1 > -2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 Using where > +2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 > EXECUTE stmt; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 2 SUBQUERY a system NULL NULL NULL NULL 1 > -2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 Using where > +2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 > DEALLOCATE PREPARE stmt; > PREPARE stmt FROM > 'EXPLAIN SELECT 1 FROM t1 > @@ -313,12 +313,12 @@ EXECUTE stmt; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 2 SUBQUERY a system NULL NULL NULL NULL 1 > -2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 Using where > +2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 > EXECUTE stmt; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 2 SUBQUERY a system NULL NULL NULL NULL 1 > -2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 Using where > +2 SUBQUERY t1 fulltext f1_2,f1 f1 0 1 > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > End of 5.1 tests. > > === modified file 'mysql-test/r/group_min_max.result' > --- a/mysql-test/r/group_min_max.result 2012-03-01 22:22:22 +0000 > +++ b/mysql-test/r/group_min_max.result 2012-05-11 15:25:03 +0000 > @@ -2398,12 +2398,12 @@ EXPLAIN SELECT 1 FROM t1 AS t1_outer WHE > (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1_outer index NULL a 10 NULL 15 Using index > -2 SUBQUERY t1 index NULL a 10 NULL 1 Using index > +2 SUBQUERY t1 index NULL a 10 NULL 15 Using index > EXPLAIN SELECT 1 FROM t1 AS t1_outer WHERE > (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2) > 12; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1_outer index NULL a 10 NULL 15 Using index > -2 SUBQUERY t1 range NULL a 5 NULL 8 Using index for group-by > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY t1 index NULL a 10 NULL 15 Using index > EXPLAIN SELECT 1 FROM t1 AS t1_outer WHERE > a IN (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2); > id select_type table type possible_keys key key_len ref rows Extra > @@ -2419,9 +2419,9 @@ EXPLAIN SELECT 1 FROM t1 AS t1_outer1 JO > ON t1_outer1.a = (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2) > AND t1_outer1.b = t1_outer2.b; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1_outer1 ref a a 5 const 2 Using where; Using index > +1 PRIMARY t1_outer1 ref a a 5 const 1 Using where; Using index > 1 PRIMARY t1_outer2 index NULL a 10 NULL 15 Using where; Using index; Using join buffer (flat, BNL join) > -2 SUBQUERY t1 range NULL a 5 NULL 8 Using index for group-by > +2 SUBQUERY t1 index NULL a 10 NULL 15 Using index > EXPLAIN SELECT (SELECT (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2) x > FROM t1 AS t1_outer) x2 FROM t1 AS t1_outer2; > id select_type table type possible_keys key key_len ref rows Extra > @@ -2756,8 +2756,8 @@ NULL > EXPLAIN > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > id select_type table type possible_keys key key_len ref rows Extra > -x x x x x x x x x Using where; Using index > -x x x x x x x x x Using where; Using index > +x x x x x x x x x Impossible WHERE noticed after reading const tables > +x x x x x x x x x Using index > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > MIN( a ) > NULL > @@ -2828,8 +2828,8 @@ NULL > EXPLAIN > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > id select_type table type possible_keys key key_len ref rows Extra > -x x x x x x x x x Using where; Using index > -x x x x x x x x x Using where; Using index > +x x x x x x x x x Impossible WHERE noticed after reading const tables > +x x x x x x x x x Using index > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > MIN( a ) > NULL > @@ -2907,8 +2907,8 @@ NULL > EXPLAIN > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > id select_type table type possible_keys key key_len ref rows Extra > -x x x x x x x x x Using where; Using index > -x x x x x x x x x Using where; Using index > +x x x x x x x x x Impossible WHERE noticed after reading const tables > +x x x x x x x x x Using index > SELECT MIN( a ) FROM t1 WHERE a = (SELECT a FROM t1 WHERE a < 0); > MIN( a ) > NULL > > === modified file 'mysql-test/r/join_outer.result' > --- a/mysql-test/r/join_outer.result 2012-04-07 13:58:46 +0000 > +++ b/mysql-test/r/join_outer.result 2012-05-11 15:25:03 +0000 > @@ -1871,10 +1871,10 @@ EXPLAIN EXTENDED > SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) IN (SELECT a FROM t3); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -1 PRIMARY t2 ALL NULL NULL NULL NULL 1 100.00 Using where > +1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 > 2 DEPENDENT SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > -Note 1003 select `test`.`t2`.`a` AS `a` from `test`.`t2` where 1 > +Note 1003 select NULL AS `a` from `test`.`t2` where 1 > DROP TABLE t1,t2,t3; > # > # LP bug #817384 Wrong result with outer join + subquery in ON > > === modified file 'mysql-test/r/join_outer_jcl6.result' > --- a/mysql-test/r/join_outer_jcl6.result 2012-04-07 13:58:46 +0000 > +++ b/mysql-test/r/join_outer_jcl6.result 2012-05-11 15:25:03 +0000 > @@ -1882,10 +1882,10 @@ EXPLAIN EXTENDED > SELECT t2.a FROM t1 LEFT JOIN t2 ON (6) IN (SELECT a FROM t3); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > -1 PRIMARY t2 ALL NULL NULL NULL NULL 1 100.00 Using where > +1 PRIMARY t2 system NULL NULL NULL NULL 1 100.00 > 2 DEPENDENT SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > -Note 1003 select `test`.`t2`.`a` AS `a` from `test`.`t2` where 1 > +Note 1003 select NULL AS `a` from `test`.`t2` where 1 > DROP TABLE t1,t2,t3; > # > # LP bug #817384 Wrong result with outer join + subquery in ON > > === modified file 'mysql-test/r/key.result' > --- a/mysql-test/r/key.result 2011-10-19 19:45:18 +0000 > +++ b/mysql-test/r/key.result 2012-05-11 15:25:03 +0000 > @@ -598,8 +598,8 @@ VALUES > EXPLAIN SELECT 1 FROM t1 AS t1_outer WHERE > (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2) > 12; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1_outer index NULL a 10 NULL 15 Using index > -2 SUBQUERY t1 range NULL a 5 NULL 8 Using index for group-by > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY t1 index NULL a 10 NULL 15 Using index > SELECT 1 as RES FROM t1 AS t1_outer WHERE > (SELECT max(b) FROM t1 GROUP BY a HAVING a < 2) > 12; > RES > > === modified file 'mysql-test/r/limit_rows_examined.result' > --- a/mysql-test/r/limit_rows_examined.result 2012-03-11 22:45:18 +0000 > +++ b/mysql-test/r/limit_rows_examined.result 2012-05-11 15:25:03 +0000 > @@ -679,7 +679,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 system NULL NULL NULL NULL 1 Using temporary > 1 PRIMARY t2 ALL NULL NULL NULL NULL 3 Distinct > 2 SUBQUERY t3 ALL NULL NULL NULL NULL 3 > -2 SUBQUERY t2 ALL NULL NULL NULL NULL 3 Using where; Using join buffer (flat, BNL join) > +2 SUBQUERY t2 ALL NULL NULL NULL NULL 3 > SELECT DISTINCT a AS field1 FROM t1, t2 > WHERE EXISTS (SELECT c FROM t3 LEFT JOIN t2 ON b = d) > HAVING field1 > 'aaa' LIMIT ROWS EXAMINED 20; > > === modified file 'mysql-test/r/myisam_mrr.result' > --- a/mysql-test/r/myisam_mrr.result 2012-02-25 15:13:24 +0000 > +++ b/mysql-test/r/myisam_mrr.result 2012-05-11 15:25:03 +0000 > @@ -349,10 +349,10 @@ WHERE t2.int_key IS NULL > GROUP BY t2.pk > ); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 100.00 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 SUBQUERY t2 ref int_key int_key 5 const 1 100.00 Using index condition > Warnings: > -Note 1003 select min(1) AS `MIN(t1.pk)` from dual where exists(select `test`.`t2`.`pk` from `test`.`t2` where isnull(`test`.`t2`.`int_key`)) > +Note 1003 select min(`test`.`t1`.`pk`) AS `MIN(t1.pk)` from `test`.`t1` where 0 > DROP TABLE t1, t2; > # > # BUG#42048 Discrepancy between MyISAM and Maria's ICP implementation > > === modified file 'mysql-test/r/mysqld--help.result' > --- a/mysql-test/r/mysqld--help.result 2012-04-10 06:28:13 +0000 > +++ b/mysql-test/r/mysqld--help.result 2012-05-11 15:25:03 +0000 > @@ -159,6 +159,9 @@ > Enable the event scheduler. Possible values are ON, OFF, > and DISABLED (keep the event scheduler completely > deactivated, it cannot be activated run-time) > + --expensive-subquery-limit=# > + The maximum number of rows a subquery examines in order > + to be considered non-expensive > --expire-logs-days=# > If non-zero, binary logs will be purged after > expire_logs_days days; possible purges happen at startup > @@ -885,6 +888,7 @@ delayed-queue-size 1000 > div-precision-increment 4 > engine-condition-pushdown FALSE > event-scheduler OFF > +expensive-subquery-limit 100 > expire-logs-days 0 > external-locking FALSE > extra-max-connections 1 > > === modified file 'mysql-test/r/subselect.result' > --- a/mysql-test/r/subselect.result 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/r/subselect.result 2012-05-11 15:25:03 +0000 > @@ -371,12 +371,12 @@ INSERT INTO t8 (pseudo,email) VALUES ('j > INSERT INTO t8 (pseudo,email) VALUES ('2joce1','2test1'); > EXPLAIN EXTENDED SELECT pseudo,(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce')) FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where; Using index > +1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > 4 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > -2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where > +2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 > 3 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > Warnings: > -Note 1003 select `test`.`t8`.`pseudo` AS `pseudo`,(select `test`.`t8`.`email` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1))) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1)) > +Note 1003 select 'joce' AS `pseudo`,(select 'test' from `test`.`t8` where 1) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where 1 > SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM > t8 WHERE pseudo='joce'); > ERROR 21000: Operand should contain 1 column(s) > @@ -517,6 +517,7 @@ ERROR 21000: Subquery returns more than > show warnings; > Level Code Message > Error 1242 Subquery returns more than 1 row > +Error 1028 Sort aborted: Subquery returns more than 1 row > drop table t1; > create table t1 (a int); > insert into t1 values (1),(2),(3); > @@ -547,11 +548,7 @@ SELECT numreponse, (SELECT numeropost FR > numreponse (SELECT numeropost FROM t1 HAVING numreponse=1) > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using where; Using index > -2 SUBQUERY t1 ref PRIMARY PRIMARY 3 const 2 100.00 Using index > -Warnings: > -Note 1003 select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = '1') and (`test`.`t1`.`numreponse` = (select 1 from `test`.`t1` where (`test`.`t1`.`numeropost` = '1')))) > +ERROR 21000: Subquery returns more than 1 row > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > ERROR 21000: Subquery returns more than 1 row > EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1'; > @@ -1675,34 +1672,34 @@ select * from t3 where NULL >= any (sele > a > explain extended select * from t3 where NULL >= any (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= any (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= any (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2); > a > explain extended select * from t3 where NULL >= some (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= some (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > insert into t2 values (2,2), (2,1), (3,3), (3,1); > select * from t3 where a > all (select max(b) from t2 group by a); > a > @@ -1764,7 +1761,7 @@ id select_type table type possible_keys > 3 UNION t1 system NULL NULL NULL NULL 1 100.00 > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL > Warnings: > -Note 1003 select 'e' AS `s1` from dual where <nop>(<in_optimizer>('f',(<min>(select 'e' from dual union select 'e' from dual) < 'f'))) > +Note 1003 select 'e' AS `s1` from dual where 1 > drop table t1; > CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; > INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); > @@ -3099,7 +3096,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3111,7 +3108,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3727,8 +3724,8 @@ explain select * from t1 where not exist > ((select t11.i from t1 t11) union (select t12.i from t1 t12)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t11 system NULL NULL NULL NULL 0 const row not found > -3 UNION t12 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 UNION NULL NULL NULL NULL NULL NULL NULL no matching row in const table > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL > DROP TABLE t1; > CREATE TABLE t1 (a VARCHAR(250), b INT auto_increment, PRIMARY KEY (b)); > @@ -4198,8 +4195,8 @@ CREATE TABLE t1 (a int, b int, KEY (a)); > INSERT INTO t1 VALUES (1,1),(2,1); > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref a a 5 const 0 Using where; Using index > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +1 PRIMARY t1 ref a a 5 const 1 Using where; Using index > +2 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > DROP TABLE t1; > CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id)); > INSERT INTO t1 VALUES > @@ -4626,7 +4623,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <nop>(<in_optimizer>(1,((select max(`test`.`t1`.`a1`) from `test`.`t1`) > 1))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > SELECT 1 FROM t1 WHERE 1 < SOME (SELECT a1 FROM t1); > 1 > 1 > @@ -5960,7 +5957,7 @@ id select_type table type possible_keys > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > DROP TABLE t1; > # > # BUG#12616253 - WRONG RESULT WITH EXISTS(SUBQUERY) (MISSING ROWS) > @@ -6121,7 +6118,7 @@ set optimizer_switch=@tmp_optimizer_swit > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > > DROP TABLE t1; > # > > === modified file 'mysql-test/r/subselect3.result' > --- a/mysql-test/r/subselect3.result 2012-04-07 13:58:46 +0000 > +++ b/mysql-test/r/subselect3.result 2012-05-11 15:25:03 +0000 > @@ -1479,7 +1479,7 @@ id select_type table type possible_keys > 3 MATERIALIZED t3 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where (not(<expr_cache><(select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9))>(<in_optimizer>((select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9)),(select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9)) in ( <materialize> (select `test`.`t3`.`b` from `test`.`t3` ), <primary_index_lookup>(9 in <temporary table> on distinct_key where ((9 = `<subquery3>`.`b`)))))))) > +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where 1 > SELECT * FROM t1 > WHERE ( > ( SELECT a FROM t2 WHERE a = 9 ), > > === modified file 'mysql-test/r/subselect3_jcl6.result' > --- a/mysql-test/r/subselect3_jcl6.result 2012-04-07 13:58:46 +0000 > +++ b/mysql-test/r/subselect3_jcl6.result 2012-05-11 15:25:03 +0000 > @@ -1489,7 +1489,7 @@ id select_type table type possible_keys > 3 MATERIALIZED t3 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where (not(<expr_cache><(select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9))>(<in_optimizer>((select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9)),(select `test`.`t2`.`a` from `test`.`t2` where (`test`.`t2`.`a` = 9)) in ( <materialize> (select `test`.`t3`.`b` from `test`.`t3` ), <primary_index_lookup>(9 in <temporary table> on distinct_key where ((9 = `<subquery3>`.`b`)))))))) > +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where 1 > SELECT * FROM t1 > WHERE ( > ( SELECT a FROM t2 WHERE a = 9 ), > > === modified file 'mysql-test/r/subselect4.result' > --- a/mysql-test/r/subselect4.result 2012-03-01 22:22:22 +0000 > +++ b/mysql-test/r/subselect4.result 2012-05-11 15:25:03 +0000 > @@ -562,7 +562,7 @@ WHERE f3 = ( > SELECT t1.f3 FROM t1 > WHERE ( t1.f10 ) IN ( SELECT f11 FROM t2 GROUP BY f11 )); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref f3 f3 5 const 0 Using where > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > 2 SUBQUERY <subquery3> eq_ref distinct_key distinct_key 4 func 1 > 3 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 > @@ -577,7 +577,7 @@ WHERE f3 = ( > SELECT f3 FROM t1 > WHERE ( f10, f10 ) IN ( SELECT f11, f11 FROM t2 GROUP BY f11 )); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref f3 f3 5 const 0 Using where > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 > 2 SUBQUERY <subquery3> eq_ref distinct_key distinct_key 8 func,func 1 > 3 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 > @@ -1220,6 +1220,13 @@ id select_type table type possible_keys > 2 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using where > 3 SUBQUERY SQ1_t1 index NULL f4 5 NULL 2 Using index; Using temporary > 3 SUBQUERY SQ1_t3 index f4 f4 5 NULL 2 Using where; Using index; Using join buffer (flat, BNL join) > +SELECT * FROM t1 WHERE > +(SELECT f2 FROM t2 > +WHERE f4 <= ALL > +(SELECT max(SQ1_t1.f4) > +FROM t3 AS SQ1_t1 JOIN t3 AS SQ1_t3 ON SQ1_t3.f4 > +GROUP BY SQ1_t1.f4)); > +ERROR 21000: Subquery returns more than 1 row > drop table t1, t2, t3; > # > # BUG#52317: Assertion failing in Field_varstring::store() > @@ -1250,8 +1257,7 @@ FROM t2 JOIN t1 ON t1.f3 > WHERE ('v') IN (SELECT f4 FROM t2) > GROUP BY f9; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t2 system NULL NULL NULL NULL 1 > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using where > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > @@ -1267,8 +1273,7 @@ FROM t2 JOIN t1 ON t1.f3 > WHERE ('v') IN (SELECT f4 FROM t2) > ORDER BY f9; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t2 system NULL NULL NULL NULL 1 > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using where > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > @@ -1277,7 +1282,7 @@ FROM t2 JOIN t1 ON t1.f3 > WHERE ('v') IN (SELECT f4 FROM t2) > ORDER BY f9; > COUNT(t2.f3) f9 > -0 2 > +0 NULL > EXPLAIN > SELECT COUNT(t2.f3), > (SELECT t2.f1 FROM t1 limit 1) AS f9 > @@ -1285,8 +1290,7 @@ FROM t2 JOIN t1 > WHERE ('v') IN (SELECT f4 FROM t2) > GROUP BY f9; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t2 system NULL NULL NULL NULL 1 > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > @@ -1302,8 +1306,7 @@ FROM t2 JOIN t1 > WHERE ('v') IN (SELECT f4 FROM t2) > ORDER BY f9; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t2 system NULL NULL NULL NULL 1 > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 3 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 > SELECT COUNT(t2.f3), > @@ -1325,7 +1328,7 @@ EXPLAIN > SELECT (SELECT f1 FROM t1) AS field1 FROM t2 GROUP BY field1; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 2 > -2 SUBQUERY t1 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT (SELECT f1 FROM t1) AS field1 FROM t2 GROUP BY field1; > field1 > NULL > @@ -1333,7 +1336,7 @@ EXPLAIN > SELECT (SELECT f1 FROM t1) AS field1 FROM t2 ORDER BY field1; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t2 ALL NULL NULL NULL NULL 2 > -2 SUBQUERY t1 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT (SELECT f1 FROM t1) AS field1 FROM t2 ORDER BY field1; > field1 > NULL > @@ -1631,7 +1634,7 @@ SET SESSION optimizer_switch='in_to_exis > EXPLAIN > SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 DEPENDENT SUBQUERY t3 system NULL NULL NULL NULL 1 > 2 DEPENDENT SUBQUERY t2 ref_or_null f10 f10 10 const,const 2 Using where; Using index > SELECT * FROM t1 WHERE ( 6 ) NOT IN ( SELECT t2.f3 FROM t2 JOIN t3 ON t3.f10 = t2.f10); > @@ -1852,8 +1855,8 @@ GROUP BY 1, 2; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t3 system NULL NULL NULL NULL 1 Using temporary; Using filesort > 1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where > -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -3 MATERIALIZED t1 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > PREPARE st1 FROM " > SELECT t2.f1, (SELECT f2 FROM t1 WHERE (7) IN (SELECT f1 FROM t1)) > FROM t2 JOIN t3 ON t3.f4 = t2.f4 > > === modified file 'mysql-test/r/subselect_cache.result' > --- a/mysql-test/r/subselect_cache.result 2012-02-15 17:08:08 +0000 > +++ b/mysql-test/r/subselect_cache.result 2012-05-11 15:25:03 +0000 > @@ -486,9 +486,9 @@ Handler_read_key 7 > Handler_read_last 0 > Handler_read_next 0 > Handler_read_prev 0 > -Handler_read_rnd 10 > +Handler_read_rnd 0 > Handler_read_rnd_deleted 0 > -Handler_read_rnd_next 42 > +Handler_read_rnd_next 31 > set optimizer_switch='subquery_cache=off'; > flush status; > select a from t1 ORDER BY (select d from t2 where b=c); > @@ -514,9 +514,9 @@ Handler_read_key 0 > Handler_read_last 0 > Handler_read_next 0 > Handler_read_prev 0 > -Handler_read_rnd 10 > +Handler_read_rnd 0 > Handler_read_rnd_deleted 0 > -Handler_read_rnd_next 72 > +Handler_read_rnd_next 61 > set optimizer_switch='subquery_cache=on'; > #single value subquery test (distinct ORDER BY) > flush status; > > === modified file 'mysql-test/r/subselect_innodb.result' > --- a/mysql-test/r/subselect_innodb.result 2012-01-13 14:50:02 +0000 > +++ b/mysql-test/r/subselect_innodb.result 2012-05-11 15:25:03 +0000 > @@ -272,8 +272,8 @@ FROM t2 > WHERE (SELECT DISTINCT b FROM t3) > 0); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1 Using where; Using index > -2 SUBQUERY t2 ALL NULL NULL NULL NULL 1 > -3 SUBQUERY t3 ALL NULL NULL NULL NULL 1 Using temporary > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +3 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 0 Using temporary > SELECT * > FROM t1 > WHERE t1.a = ( > @@ -301,7 +301,7 @@ GROUP BY 1 > ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 1 > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 3 SUBQUERY t3 ALL NULL NULL NULL NULL 1 > SELECT MAX( f1 ) FROM t2 > WHERE f2 >= ( > > === modified file 'mysql-test/r/subselect_mat.result' > --- a/mysql-test/r/subselect_mat.result 2012-03-17 08:26:58 +0000 > +++ b/mysql-test/r/subselect_mat.result 2012-05-11 15:25:03 +0000 > @@ -1152,8 +1152,8 @@ create table t2 (b1 int); > insert into t1 values (5); > explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 MATERIALIZED t2 system NULL NULL NULL NULL 0 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > min(a1) > NULL > @@ -1162,8 +1162,8 @@ set @@optimizer_switch=@optimizer_switch > set @@optimizer_switch='materialization=off,in_to_exists=on'; > explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > min(a1) > NULL > @@ -1171,8 +1171,8 @@ set @@optimizer_switch=@optimizer_switch > set @@optimizer_switch='semijoin=off'; > explain select min(a1) from t1 where 7 in (select b1 from t2); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 MATERIALIZED t2 system NULL NULL NULL NULL 0 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2); > min(a1) > NULL > @@ -1181,16 +1181,16 @@ set @@optimizer_switch='materialization= > # with MariaDB and MWL#90, this particular case is solved: > explain select min(a1) from t1 where 7 in (select b1 from t2); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2); > min(a1) > NULL > # but when we go around MWL#90 code, the problem still shows up: > explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > min(a1) > NULL > @@ -1932,7 +1932,7 @@ WHERE s2.d = s1.e AND s1.e = (SELECT MAX > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 1 PRIMARY t2 index NULL c 5 NULL 8 Using where; Using index > -2 MATERIALIZED s2 ref d d 4 const 1 Using where; Using index > +2 MATERIALIZED s2 ref d d 4 const 2 Using where; Using index > 2 MATERIALIZED s1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) > 3 SUBQUERY t2 ALL NULL NULL NULL NULL 8 > SELECT a, c FROM t1, t2 > @@ -1951,8 +1951,8 @@ WHERE s2.d = s1.e AND s1.e = (SELECT MAX > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 1 PRIMARY t2 index NULL c 5 NULL 8 Using where; Using index > -2 MATERIALIZED s2 ref d d 4 const 1 Using where; Using index > -2 MATERIALIZED s1 hash_ALL NULL #hash#$hj 5 test.s2.d 8 Using where; Using join buffer (flat, BNLH join) > +2 MATERIALIZED s2 ref d d 4 const 2 Using where; Using index > +2 MATERIALIZED s1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) > 3 SUBQUERY t2 ALL NULL NULL NULL NULL 8 > SELECT a, c FROM t1, t2 > WHERE (a, c) IN (SELECT s1.b, s1.c FROM t2 AS s1, t2 AS s2 > @@ -2153,7 +2153,7 @@ set @@optimizer_switch='materialization= > EXPLAIN > SELECT * FROM t2 WHERE (SELECT f3a FROM t3) NOT IN (SELECT f1a FROM t1); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t2 ALL NULL NULL NULL NULL 2 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 3 MATERIALIZED t1 ALL NULL NULL NULL NULL 2 > 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT * FROM t2 WHERE (SELECT f3a FROM t3) NOT IN (SELECT f1a FROM t1); > @@ -2222,10 +2222,10 @@ NULL > EXPLAIN EXTENDED > SELECT MAX(t1.b) AS max_res FROM t1 WHERE (9) IN (SELECT a FROM t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 index NULL b 5 NULL 2 100.00 Using index > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where <expr_cache><9>(<in_optimizer>(9,9 in ( <materialize> (select `test`.`t2`.`a` from `test`.`t2` ), <primary_index_lookup>(9 in <temporary table> on distinct_key where ((9 = `<subquery2>`.`a`)))))) > +Note 1003 select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where 0 > set @@optimizer_switch='materialization=off,in_to_exists=on,semijoin=off'; > SELECT MAX(t1.b) AS max_res FROM t1 WHERE (9) IN (SELECT a FROM t2); > max_res > @@ -2233,10 +2233,10 @@ NULL > EXPLAIN EXTENDED > SELECT MAX(t1.b) AS max_res FROM t1 WHERE (9) IN (SELECT a FROM t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 index NULL b 5 NULL 2 100.00 Using index > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 2 100.00 Using where > Warnings: > -Note 1003 select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where <expr_cache><9>(<in_optimizer>(9,<exists>(select `test`.`t2`.`a` from `test`.`t2` where (9 = `test`.`t2`.`a`)))) > +Note 1003 select max(`test`.`t1`.`b`) AS `max_res` from `test`.`t1` where 0 > DROP TABLE t1,t2; > # > # LPBUG#825095: Wrong result with materialization and NOT IN with 2 expressions > > === modified file 'mysql-test/r/subselect_mat_cost_bugs.result' > --- a/mysql-test/r/subselect_mat_cost_bugs.result 2012-01-13 14:50:02 +0000 > +++ b/mysql-test/r/subselect_mat_cost_bugs.result 2012-05-11 15:25:03 +0000 > @@ -124,7 +124,7 @@ FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1 > WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 ); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > SELECT t1.* > FROM t3 RIGHT JOIN t1 ON t1.pk = t3.f1 > WHERE t3.f3 OR ( 3 ) IN ( SELECT f2 FROM t2 ); > @@ -148,7 +148,7 @@ FROM t2 GROUP BY f1 > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > 2 SUBQUERY t1 system NULL NULL NULL NULL 1 > -3 SUBQUERY t2 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +3 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > drop table t1, t2, t3; > # > # LP BUG#715034 Item_sum_distinct::clear(): Assertion `tree != 0' failed > > === modified file 'mysql-test/r/subselect_no_mat.result' > --- a/mysql-test/r/subselect_no_mat.result 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/r/subselect_no_mat.result 2012-05-11 15:25:03 +0000 > @@ -378,12 +378,12 @@ INSERT INTO t8 (pseudo,email) VALUES ('j > INSERT INTO t8 (pseudo,email) VALUES ('2joce1','2test1'); > EXPLAIN EXTENDED SELECT pseudo,(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce')) FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where; Using index > +1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > 4 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > -2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where > +2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 > 3 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > Warnings: > -Note 1003 select `test`.`t8`.`pseudo` AS `pseudo`,(select `test`.`t8`.`email` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1))) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1)) > +Note 1003 select 'joce' AS `pseudo`,(select 'test' from `test`.`t8` where 1) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where 1 > SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM > t8 WHERE pseudo='joce'); > ERROR 21000: Operand should contain 1 column(s) > @@ -524,6 +524,7 @@ ERROR 21000: Subquery returns more than > show warnings; > Level Code Message > Error 1242 Subquery returns more than 1 row > +Error 1028 Sort aborted: Subquery returns more than 1 row > drop table t1; > create table t1 (a int); > insert into t1 values (1),(2),(3); > @@ -554,11 +555,7 @@ SELECT numreponse, (SELECT numeropost FR > numreponse (SELECT numeropost FROM t1 HAVING numreponse=1) > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using where; Using index > -2 SUBQUERY t1 ref PRIMARY PRIMARY 3 const 2 100.00 Using index > -Warnings: > -Note 1003 select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = '1') and (`test`.`t1`.`numreponse` = (select 1 from `test`.`t1` where (`test`.`t1`.`numeropost` = '1')))) > +ERROR 21000: Subquery returns more than 1 row > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > ERROR 21000: Subquery returns more than 1 row > EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1'; > @@ -1682,34 +1679,34 @@ select * from t3 where NULL >= any (sele > a > explain extended select * from t3 where NULL >= any (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= any (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= any (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2); > a > explain extended select * from t3 where NULL >= some (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= some (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > insert into t2 values (2,2), (2,1), (3,3), (3,1); > select * from t3 where a > all (select max(b) from t2 group by a); > a > @@ -1771,7 +1768,7 @@ id select_type table type possible_keys > 3 UNION t1 system NULL NULL NULL NULL 1 100.00 > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL > Warnings: > -Note 1003 select 'e' AS `s1` from dual where <nop>(<in_optimizer>('f',(<min>(select 'e' from dual union select 'e' from dual) < 'f'))) > +Note 1003 select 'e' AS `s1` from dual where 1 > drop table t1; > CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; > INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); > @@ -3105,7 +3102,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3117,7 +3114,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3731,8 +3728,8 @@ explain select * from t1 where not exist > ((select t11.i from t1 t11) union (select t12.i from t1 t12)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t11 system NULL NULL NULL NULL 0 const row not found > -3 UNION t12 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 UNION NULL NULL NULL NULL NULL NULL NULL no matching row in const table > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL > DROP TABLE t1; > CREATE TABLE t1 (a VARCHAR(250), b INT auto_increment, PRIMARY KEY (b)); > @@ -4202,8 +4199,8 @@ CREATE TABLE t1 (a int, b int, KEY (a)); > INSERT INTO t1 VALUES (1,1),(2,1); > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref a a 5 const 0 Using where; Using index > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +1 PRIMARY t1 ref a a 5 const 1 Using where; Using index > +2 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > DROP TABLE t1; > CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id)); > INSERT INTO t1 VALUES > @@ -4531,13 +4528,13 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`)))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`)))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > DROP TABLE t1; > # > @@ -4628,7 +4625,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <nop>(<in_optimizer>(1,((select max(`test`.`t1`.`a1`) from `test`.`t1`) > 1))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > SELECT 1 FROM t1 WHERE 1 < SOME (SELECT a1 FROM t1); > 1 > 1 > @@ -5961,7 +5958,7 @@ id select_type table type possible_keys > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > DROP TABLE t1; > # > # BUG#12616253 - WRONG RESULT WITH EXISTS(SUBQUERY) (MISSING ROWS) > @@ -6120,7 +6117,7 @@ set optimizer_switch=@tmp_optimizer_swit > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > > DROP TABLE t1; > # > > === modified file 'mysql-test/r/subselect_no_opts.result' > --- a/mysql-test/r/subselect_no_opts.result 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/r/subselect_no_opts.result 2012-05-11 15:25:03 +0000 > @@ -374,12 +374,12 @@ INSERT INTO t8 (pseudo,email) VALUES ('j > INSERT INTO t8 (pseudo,email) VALUES ('2joce1','2test1'); > EXPLAIN EXTENDED SELECT pseudo,(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce')) FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where; Using index > +1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > 4 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > -2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where > +2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 > 3 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > Warnings: > -Note 1003 select `test`.`t8`.`pseudo` AS `pseudo`,(select `test`.`t8`.`email` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1))) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1)) > +Note 1003 select 'joce' AS `pseudo`,(select 'test' from `test`.`t8` where 1) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where 1 > SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM > t8 WHERE pseudo='joce'); > ERROR 21000: Operand should contain 1 column(s) > @@ -520,6 +520,7 @@ ERROR 21000: Subquery returns more than > show warnings; > Level Code Message > Error 1242 Subquery returns more than 1 row > +Error 1028 Sort aborted: Subquery returns more than 1 row > drop table t1; > create table t1 (a int); > insert into t1 values (1),(2),(3); > @@ -550,11 +551,7 @@ SELECT numreponse, (SELECT numeropost FR > numreponse (SELECT numeropost FROM t1 HAVING numreponse=1) > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using where; Using index > -2 SUBQUERY t1 ref PRIMARY PRIMARY 3 const 2 100.00 Using index > -Warnings: > -Note 1003 select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = '1') and (`test`.`t1`.`numreponse` = (select 1 from `test`.`t1` where (`test`.`t1`.`numeropost` = '1')))) > +ERROR 21000: Subquery returns more than 1 row > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > ERROR 21000: Subquery returns more than 1 row > EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1'; > @@ -1678,34 +1675,34 @@ select * from t3 where NULL >= any (sele > a > explain extended select * from t3 where NULL >= any (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= any (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= any (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2); > a > explain extended select * from t3 where NULL >= some (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= some (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > insert into t2 values (2,2), (2,1), (3,3), (3,1); > select * from t3 where a > all (select max(b) from t2 group by a); > a > @@ -1767,7 +1764,7 @@ id select_type table type possible_keys > 3 UNION t1 system NULL NULL NULL NULL 1 100.00 > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL > Warnings: > -Note 1003 select 'e' AS `s1` from dual where <nop>(<in_optimizer>('f',(<min>(select 'e' from dual union select 'e' from dual) < 'f'))) > +Note 1003 select 'e' AS `s1` from dual where 1 > drop table t1; > CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; > INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); > @@ -3101,7 +3098,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3113,7 +3110,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3727,8 +3724,8 @@ explain select * from t1 where not exist > ((select t11.i from t1 t11) union (select t12.i from t1 t12)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t11 system NULL NULL NULL NULL 0 const row not found > -3 UNION t12 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 UNION NULL NULL NULL NULL NULL NULL NULL no matching row in const table > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL > DROP TABLE t1; > CREATE TABLE t1 (a VARCHAR(250), b INT auto_increment, PRIMARY KEY (b)); > @@ -4198,8 +4195,8 @@ CREATE TABLE t1 (a int, b int, KEY (a)); > INSERT INTO t1 VALUES (1,1),(2,1); > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref a a 5 const 0 Using where; Using index > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +1 PRIMARY t1 ref a a 5 const 1 Using where; Using index > +2 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > DROP TABLE t1; > CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id)); > INSERT INTO t1 VALUES > @@ -4527,13 +4524,13 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > 2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <in_optimizer>(1,<exists>(select min(`test`.`t1`.`a`) from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` having (1 = <ref_null_helper>(min(`test`.`t1`.`a`))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > DROP TABLE t1; > # > @@ -4624,7 +4621,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <nop>(<in_optimizer>(1,((select max(`test`.`t1`.`a1`) from `test`.`t1`) > 1))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > SELECT 1 FROM t1 WHERE 1 < SOME (SELECT a1 FROM t1); > 1 > 1 > @@ -5957,7 +5954,7 @@ id select_type table type possible_keys > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > DROP TABLE t1; > # > # BUG#12616253 - WRONG RESULT WITH EXISTS(SUBQUERY) (MISSING ROWS) > @@ -6116,7 +6113,7 @@ set optimizer_switch=@tmp_optimizer_swit > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > > DROP TABLE t1; > # > > === modified file 'mysql-test/r/subselect_no_scache.result' > --- a/mysql-test/r/subselect_no_scache.result 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/r/subselect_no_scache.result 2012-05-11 15:25:03 +0000 > @@ -377,12 +377,12 @@ INSERT INTO t8 (pseudo,email) VALUES ('j > INSERT INTO t8 (pseudo,email) VALUES ('2joce1','2test1'); > EXPLAIN EXTENDED SELECT pseudo,(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce')) FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where; Using index > +1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > 4 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > -2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where > +2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 > 3 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > Warnings: > -Note 1003 select `test`.`t8`.`pseudo` AS `pseudo`,(select `test`.`t8`.`email` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1))) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1)) > +Note 1003 select 'joce' AS `pseudo`,(select 'test' from `test`.`t8` where 1) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where 1 > SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM > t8 WHERE pseudo='joce'); > ERROR 21000: Operand should contain 1 column(s) > @@ -523,6 +523,7 @@ ERROR 21000: Subquery returns more than > show warnings; > Level Code Message > Error 1242 Subquery returns more than 1 row > +Error 1028 Sort aborted: Subquery returns more than 1 row > drop table t1; > create table t1 (a int); > insert into t1 values (1),(2),(3); > @@ -553,11 +554,7 @@ SELECT numreponse, (SELECT numeropost FR > numreponse (SELECT numeropost FROM t1 HAVING numreponse=1) > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using where; Using index > -2 SUBQUERY t1 ref PRIMARY PRIMARY 3 const 2 100.00 Using index > -Warnings: > -Note 1003 select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = '1') and (`test`.`t1`.`numreponse` = (select 1 from `test`.`t1` where (`test`.`t1`.`numeropost` = '1')))) > +ERROR 21000: Subquery returns more than 1 row > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > ERROR 21000: Subquery returns more than 1 row > EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1'; > @@ -1681,34 +1678,34 @@ select * from t3 where NULL >= any (sele > a > explain extended select * from t3 where NULL >= any (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= any (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= any (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2); > a > explain extended select * from t3 where NULL >= some (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= some (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > insert into t2 values (2,2), (2,1), (3,3), (3,1); > select * from t3 where a > all (select max(b) from t2 group by a); > a > @@ -1770,7 +1767,7 @@ id select_type table type possible_keys > 3 UNION t1 system NULL NULL NULL NULL 1 100.00 > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL > Warnings: > -Note 1003 select 'e' AS `s1` from dual where <nop>(<in_optimizer>('f',(<min>(select 'e' from dual union select 'e' from dual) < 'f'))) > +Note 1003 select 'e' AS `s1` from dual where 1 > drop table t1; > CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; > INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); > @@ -3105,7 +3102,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3117,7 +3114,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3733,8 +3730,8 @@ explain select * from t1 where not exist > ((select t11.i from t1 t11) union (select t12.i from t1 t12)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t11 system NULL NULL NULL NULL 0 const row not found > -3 UNION t12 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 UNION NULL NULL NULL NULL NULL NULL NULL no matching row in const table > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL > DROP TABLE t1; > CREATE TABLE t1 (a VARCHAR(250), b INT auto_increment, PRIMARY KEY (b)); > @@ -4204,8 +4201,8 @@ CREATE TABLE t1 (a int, b int, KEY (a)); > INSERT INTO t1 VALUES (1,1),(2,1); > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref a a 5 const 0 Using where; Using index > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +1 PRIMARY t1 ref a a 5 const 1 Using where; Using index > +2 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > DROP TABLE t1; > CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id)); > INSERT INTO t1 VALUES > @@ -4632,7 +4629,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <nop>(<in_optimizer>(1,((select max(`test`.`t1`.`a1`) from `test`.`t1`) > 1))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > SELECT 1 FROM t1 WHERE 1 < SOME (SELECT a1 FROM t1); > 1 > 1 > @@ -5966,7 +5963,7 @@ id select_type table type possible_keys > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > DROP TABLE t1; > # > # BUG#12616253 - WRONG RESULT WITH EXISTS(SUBQUERY) (MISSING ROWS) > @@ -6127,7 +6124,7 @@ set optimizer_switch=@tmp_optimizer_swit > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > > DROP TABLE t1; > # > > === modified file 'mysql-test/r/subselect_no_semijoin.result' > --- a/mysql-test/r/subselect_no_semijoin.result 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/r/subselect_no_semijoin.result 2012-05-11 15:25:03 +0000 > @@ -374,12 +374,12 @@ INSERT INTO t8 (pseudo,email) VALUES ('j > INSERT INTO t8 (pseudo,email) VALUES ('2joce1','2test1'); > EXPLAIN EXTENDED SELECT pseudo,(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce')) FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where; Using index > +1 PRIMARY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > 4 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > -2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using where > +2 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 > 3 SUBQUERY t8 const PRIMARY PRIMARY 37 const 1 100.00 Using index > Warnings: > -Note 1003 select `test`.`t8`.`pseudo` AS `pseudo`,(select `test`.`t8`.`email` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1))) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where (`test`.`t8`.`pseudo` = (select 'joce' from `test`.`t8` where 1)) > +Note 1003 select 'joce' AS `pseudo`,(select 'test' from `test`.`t8` where 1) AS `(SELECT email FROM t8 WHERE pseudo=(SELECT pseudo FROM t8 WHERE pseudo='joce'))` from `test`.`t8` where 1 > SELECT pseudo FROM t8 WHERE pseudo=(SELECT pseudo,email FROM > t8 WHERE pseudo='joce'); > ERROR 21000: Operand should contain 1 column(s) > @@ -520,6 +520,7 @@ ERROR 21000: Subquery returns more than > show warnings; > Level Code Message > Error 1242 Subquery returns more than 1 row > +Error 1028 Sort aborted: Subquery returns more than 1 row > drop table t1; > create table t1 (a int); > insert into t1 values (1),(2),(3); > @@ -550,11 +551,7 @@ SELECT numreponse, (SELECT numeropost FR > numreponse (SELECT numeropost FROM t1 HAVING numreponse=1) > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using where; Using index > -2 SUBQUERY t1 ref PRIMARY PRIMARY 3 const 2 100.00 Using index > -Warnings: > -Note 1003 select `test`.`t1`.`numreponse` AS `numreponse` from `test`.`t1` where ((`test`.`t1`.`numeropost` = '1') and (`test`.`t1`.`numreponse` = (select 1 from `test`.`t1` where (`test`.`t1`.`numeropost` = '1')))) > +ERROR 21000: Subquery returns more than 1 row > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > ERROR 21000: Subquery returns more than 1 row > EXPLAIN EXTENDED SELECT MAX(numreponse) FROM t1 WHERE numeropost='1'; > @@ -1678,34 +1675,34 @@ select * from t3 where NULL >= any (sele > a > explain extended select * from t3 where NULL >= any (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= any (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= any (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2); > a > explain extended select * from t3 where NULL >= some (select b from t2); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > select * from t3 where NULL >= some (select b from t2 group by 1); > a > explain extended select * from t3 where NULL >= some (select b from t2 group by 1); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t3 ALL NULL NULL NULL NULL 3 100.00 > -2 SUBQUERY t2 system NULL NULL NULL NULL 0 0.00 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table > Warnings: > -Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>(<in_optimizer>(NULL,((select min(NULL) from `test`.`t2`) <= NULL))) > +Note 1003 select `test`.`t3`.`a` AS `a` from `test`.`t3` where 0 > insert into t2 values (2,2), (2,1), (3,3), (3,1); > select * from t3 where a > all (select max(b) from t2 group by a); > a > @@ -1767,7 +1764,7 @@ id select_type table type possible_keys > 3 UNION t1 system NULL NULL NULL NULL 1 100.00 > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL NULL > Warnings: > -Note 1003 select 'e' AS `s1` from dual where <nop>(<in_optimizer>('f',(<min>(select 'e' from dual union select 'e' from dual) < 'f'))) > +Note 1003 select 'e' AS `s1` from dual where 1 > drop table t1; > CREATE TABLE t1 (number char(11) NOT NULL default '') ENGINE=MyISAM CHARSET=latin1; > INSERT INTO t1 VALUES ('69294728265'),('18621828126'),('89356874041'),('95895001874'); > @@ -3101,7 +3098,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3113,7 +3110,7 @@ ON r.a = (SELECT t2.a FROM t2 WHERE t2.c > ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10; > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 system PRIMARY NULL NULL NULL 1 > -1 PRIMARY r eq_ref PRIMARY PRIMARY 4 const 1 Using where > +1 PRIMARY r const PRIMARY PRIMARY 4 const 1 > 2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using index condition > SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r > ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899' > @@ -3727,8 +3724,8 @@ explain select * from t1 where not exist > ((select t11.i from t1 t11) union (select t12.i from t1 t12)); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > -2 SUBQUERY t11 system NULL NULL NULL NULL 0 const row not found > -3 UNION t12 system NULL NULL NULL NULL 0 const row not found > +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > +3 UNION NULL NULL NULL NULL NULL NULL NULL no matching row in const table > NULL UNION RESULT <union2,3> ALL NULL NULL NULL NULL NULL > DROP TABLE t1; > CREATE TABLE t1 (a VARCHAR(250), b INT auto_increment, PRIMARY KEY (b)); > @@ -4198,8 +4195,8 @@ CREATE TABLE t1 (a int, b int, KEY (a)); > INSERT INTO t1 VALUES (1,1),(2,1); > EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 ref a a 5 const 0 Using where; Using index > -2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort > +1 PRIMARY t1 ref a a 5 const 1 Using where; Using index > +2 SUBQUERY internal_tmp_table ALL group_key NULL NULL NULL 1 Using temporary; Using filesort > DROP TABLE t1; > CREATE TABLE t1 (id int NOT NULL, st CHAR(2), INDEX idx(id)); > INSERT INTO t1 VALUES > @@ -4525,15 +4522,15 @@ SET join_cache_level=0; > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > -2 MATERIALIZED t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,1 in ( <materialize> (select min(`test`.`t1`.`a`) from `test`.`t1` group by `test`.`t1`.`a` ), <primary_index_lookup>(1 in <temporary table> on distinct_key where ((1 = `<subquery2>`.`min(a)`)))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE 1 IN (SELECT min(a) FROM t1 WHERE a > 3 GROUP BY a); > id select_type table type possible_keys key key_len ref rows filtered Extra > -1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > -2 MATERIALIZED t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE > +2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 Using where; Using temporary > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <expr_cache><1>(<in_optimizer>(1,1 in ( <materialize> (select min(`test`.`t1`.`a`) from `test`.`t1` where (`test`.`t1`.`a` > 3) group by `test`.`t1`.`a` ), <primary_index_lookup>(1 in <temporary table> on distinct_key where ((1 = `<subquery2>`.`min(a)`)))))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 0 > SET join_cache_level=@save_join_cache_level; > DROP TABLE t1; > # > @@ -4624,7 +4621,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 100.00 > 2 SUBQUERY t1 ALL NULL NULL NULL NULL 2 100.00 > Warnings: > -Note 1003 select 1 AS `1` from `test`.`t1` where <nop>(<in_optimizer>(1,((select max(`test`.`t1`.`a1`) from `test`.`t1`) > 1))) > +Note 1003 select 1 AS `1` from `test`.`t1` where 1 > SELECT 1 FROM t1 WHERE 1 < SOME (SELECT a1 FROM t1); > 1 > 1 > @@ -5957,7 +5954,7 @@ id select_type table type possible_keys > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > DROP TABLE t1; > # > # BUG#12616253 - WRONG RESULT WITH EXISTS(SUBQUERY) (MISSING ROWS) > @@ -6116,7 +6113,7 @@ set optimizer_switch=@tmp_optimizer_swit > EXPLAIN SELECT * FROM t1 WHERE EXISTS (SELECT * FROM t1 WHERE a=7); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 > -2 SUBQUERY t1 ref a a 5 const 1 Using index > +2 SUBQUERY t1 ref a a 5 const 1 > > DROP TABLE t1; > # > > === modified file 'mysql-test/r/subselect_sj_mat.result' > --- a/mysql-test/r/subselect_sj_mat.result 2012-04-07 13:58:46 +0000 > +++ b/mysql-test/r/subselect_sj_mat.result 2012-05-11 15:25:03 +0000 > @@ -1197,8 +1197,8 @@ set @@optimizer_switch=@optimizer_switch > set @@optimizer_switch='materialization=off,in_to_exists=on'; > explain select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY t2 system NULL NULL NULL NULL 0 const row not found > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select max(b1) from t2 group by b1); > min(a1) > NULL > @@ -1206,8 +1206,8 @@ set @@optimizer_switch=@optimizer_switch > set @@optimizer_switch='semijoin=off'; > explain select min(a1) from t1 where 7 in (select b1 from t2); > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2); > min(a1) > NULL > @@ -1223,8 +1223,8 @@ NULL > # but when we go around MWL#90 code, the problem still shows up: > explain select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > id select_type table type possible_keys key key_len ref rows Extra > -1 PRIMARY t1 system NULL NULL NULL NULL 1 > -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL no matching row in const table > select min(a1) from t1 where 7 in (select b1 from t2) or 2> 4; > min(a1) > NULL > @@ -1971,7 +1971,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 1 PRIMARY t2 index c c 5 NULL 8 Using index > 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 8 func,func 1 > -2 MATERIALIZED s2 ref d d 4 const 1 Using where; Using index > +2 MATERIALIZED s2 ref d d 4 const 2 Using where; Using index > 2 MATERIALIZED s1 ALL c NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) > 3 SUBQUERY t2 ALL NULL NULL NULL NULL 8 > SELECT a, c FROM t1, t2 > @@ -1991,8 +1991,8 @@ id select_type table type possible_keys > 1 PRIMARY t1 system NULL NULL NULL NULL 1 > 1 PRIMARY t2 index c c 5 NULL 8 Using index > 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 8 func,func 1 > -2 MATERIALIZED s2 ref d d 4 const 1 Using where; Using index > -2 MATERIALIZED s1 hash_ALL c #hash#$hj 10 const,test.s2.d 8 Using where; Using join buffer (flat, BNLH join) > +2 MATERIALIZED s2 ref d d 4 const 2 Using where; Using index > +2 MATERIALIZED s1 hash_ALL c #hash#$hj 5 const 8 Using where; Using join buffer (flat, BNLH join) > 3 SUBQUERY t2 ALL NULL NULL NULL NULL 8 > SELECT a, c FROM t1, t2 > WHERE (a, c) IN (SELECT s1.b, s1.c FROM t2 AS s1, t2 AS s2 > > === modified file 'mysql-test/suite/sys_vars/r/all_vars.result' > --- a/mysql-test/suite/sys_vars/r/all_vars.result 2012-03-09 07:06:59 +0000 > +++ b/mysql-test/suite/sys_vars/r/all_vars.result 2012-05-11 15:25:03 +0000 > @@ -10,5 +10,6 @@ where length(variable_name) > 50; > select distinct variable_name as `there should be *no* variables listed below:` from t2 > left join t1 on variable_name=test_name where test_name is null; > there should be *no* variables listed below: > +expensive_subquery_limit > drop table t1; > drop table t2; > > === modified file 'mysql-test/t/subselect.test' > --- a/mysql-test/t/subselect.test 2012-05-04 05:16:38 +0000 > +++ b/mysql-test/t/subselect.test 2012-05-11 15:25:03 +0000 > @@ -304,6 +304,7 @@ SELECT (SELECT numeropost FROM t1 HAVING > SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=a) FROM (SELECT * FROM t1) as a; > SELECT numreponse, (SELECT numeropost FROM t1 HAVING numreponse=1) FROM (SELECT * FROM t1) as a; > INSERT INTO t1 (numeropost,numreponse,pseudo) VALUES (1,1,'joce'),(1,2,'joce'),(1,3,'test'); > +-- error ER_SUBQUERY_NO_1_ROW > EXPLAIN EXTENDED SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > -- error ER_SUBQUERY_NO_1_ROW > SELECT numreponse FROM t1 WHERE numeropost='1' AND numreponse=(SELECT 1 FROM t1 WHERE numeropost='1'); > > === modified file 'mysql-test/t/subselect4.test' > --- a/mysql-test/t/subselect4.test 2012-03-01 22:22:22 +0000 > +++ b/mysql-test/t/subselect4.test 2012-05-11 15:25:03 +0000 > @@ -977,6 +977,14 @@ SELECT * FROM t1 WHERE > FROM t3 AS SQ1_t1 JOIN t3 AS SQ1_t3 ON SQ1_t3.f4 > GROUP BY SQ1_t1.f4)); > > +--error ER_SUBQUERY_NO_1_ROW > +SELECT * FROM t1 WHERE > +(SELECT f2 FROM t2 > + WHERE f4 <= ALL > + (SELECT max(SQ1_t1.f4) > + FROM t3 AS SQ1_t1 JOIN t3 AS SQ1_t3 ON SQ1_t3.f4 > + GROUP BY SQ1_t1.f4)); > + > drop table t1, t2, t3; > > --echo # > > === modified file 'sql/item.h' > --- a/sql/item.h 2012-04-10 06:28:13 +0000 > +++ b/sql/item.h 2012-05-11 15:25:03 +0000 > @@ -1395,21 +1395,21 @@ class Item { > { > return cmp_context == IMPOSSIBLE_RESULT || item->cmp_context == cmp_context; > } > - /* > + /** > Test whether an expression is expensive to compute. Used during > optimization to avoid computing expensive expressions during this > phase. Also used to force temp tables when sorting on expensive > functions. > - TODO: > + @todo > Normally we should have a method: > cost Item::execution_cost(), > where 'cost' is either 'double' or some structure of various cost > parameters. > > - NOTE > - This function is now used to prevent evaluation of materialized IN > - subquery predicates before it is allowed. grep for > - DontEvaluateMaterializedSubqueryTooEarly to see the uses. > + @note > + This function is now used to prevent evaluation of expensive subquery > + predicates during the optimization phase. It also prevents evaluation > + of predicates that are not computable at this moment (infinite cost). Could you elaborate more on the "infinite cost" part? (let's discuss it on irc) > */ > virtual bool is_expensive() > { > > === modified file 'sql/item_cmpfunc.cc' > --- a/sql/item_cmpfunc.cc 2012-03-28 18:25:31 +0000 > +++ b/sql/item_cmpfunc.cc 2012-05-11 15:25:03 +0000 > @@ -5539,7 +5539,8 @@ void Item_equal::add_const(Item *c, Item > else > { > Item_func_eq *func= new Item_func_eq(c, const_item); > - func->set_cmp_func(); > + if(func->set_cmp_func()) > + return; Please add space after "if", Please add a comment about what kind of condition can cause the problem. As far as I understand, this is a kind of error? > func->quick_fix_field(); > cond_false= !func->val_int(); > } > > === modified file 'sql/item_cmpfunc.h' > --- a/sql/item_cmpfunc.h 2012-05-04 05:16:38 +0000 > +++ b/sql/item_cmpfunc.h 2012-05-11 15:25:03 +0000 > @@ -370,9 +370,9 @@ class Item_bool_func2 :public Item_int_f > Item_bool_func2(Item *a,Item *b) > :Item_int_func(a,b), cmp(tmp_arg, tmp_arg+1), abort_on_null(FALSE) {} > void fix_length_and_dec(); > - void set_cmp_func() > + int set_cmp_func() > { > - cmp.set_cmp_func(this, tmp_arg, tmp_arg+1, TRUE); > + return cmp.set_cmp_func(this, tmp_arg, tmp_arg+1, TRUE); > } > optimize_type select_optimize() const { return OPTIMIZE_OP; } > virtual enum Functype rev_functype() const { return UNKNOWN_FUNC; } > > === modified file 'sql/item_strfunc.h' > --- a/sql/item_strfunc.h 2012-03-06 19:46:07 +0000 > +++ b/sql/item_strfunc.h 2012-05-11 15:25:03 +0000 > @@ -829,7 +829,7 @@ class Item_func_conv_charset :public Ite > { > DBUG_ASSERT(args[0]->fixed); > conv_charset= cs; > - if (cache_if_const && args[0]->const_item() && !args[0]->with_subselect) > + if (cache_if_const && args[0]->const_item() && !args[0]->is_expensive()) > { > uint errors= 0; > String tmp, *str= args[0]->val_str(&tmp); > > === modified file 'sql/item_subselect.cc' > --- a/sql/item_subselect.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/item_subselect.cc 2012-05-11 15:25:03 +0000 > @@ -522,6 +522,48 @@ void Item_subselect::recalc_used_tables( > */ > } > > + > +/** > + Determine if a subquery is expensive to execute during query optimization. > + > + @details The cost of execution of a subquery is estimated based on an > + estimate of the number of rows the subquery will access during execution. > + This measure is used instead of JOIN::read_time, because it is considered > + to be much more reliable than the cost estimate. > + > + @return true if the subquery is expensive > + @return false otherwise > +*/ > +bool Item_subselect::is_expensive() > +{ > + double examined_rows= 0; > + > + for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) > + { > + JOIN *cur_join= sl->join; > + if (!cur_join) > + continue; > + > + /* If a subquery is not optimized we cannot estimate its cost. */ > + if (!cur_join->join_tab) > + return true; > + > + if (sl->first_inner_unit()) > + { > + /* > + Subqueries that contain subqueries are considered expensive. > + @todo: accumulate the cost of subqueries. > + */ > + return true; > + } > + > + examined_rows+= cur_join->get_examined_rows(); > + } > + > + return (examined_rows > thd->variables.expensive_subquery_limit); > +} > + > + > bool Item_subselect::walk(Item_processor processor, bool walk_subquery, > uchar *argument) > { > > === modified file 'sql/item_subselect.h' > --- a/sql/item_subselect.h 2012-05-04 05:16:38 +0000 > +++ b/sql/item_subselect.h 2012-05-11 15:25:03 +0000 > @@ -191,6 +191,7 @@ class Item_subselect :public Item_result > table_map used_tables() const; > table_map not_null_tables() const { return 0; } > bool const_item() const; > + virtual bool const_pred() const { return const_item(); } What is this function for? It seems to have the same semantics as const_item(), but it is a separate function, which implies there is some difference. Could you add a comment about this? > inline table_map get_used_tables_cache() { return used_tables_cache; } > Item *get_tmp_table_item(THD *thd); > void update_used_tables(); > @@ -209,7 +210,7 @@ class Item_subselect :public Item_result > */ > bool is_evaluated() const; > bool is_uncacheable() const; > - bool is_expensive() { return TRUE; } > + bool is_expensive(); > > /* > Used by max/min subquery to initialize value presence registration > @@ -235,7 +236,7 @@ class Item_subselect :public Item_result > @retval TRUE if the predicate is expensive > @retval FALSE otherwise > */ > - bool is_expensive_processor(uchar *arg) { return TRUE; } > + bool is_expensive_processor(uchar *arg) { return is_expensive(); } > > /** > Get the SELECT_LEX structure associated with this Item. > @@ -581,6 +582,7 @@ class Item_in_subselect :public Item_exi > bool fix_fields(THD *thd, Item **ref); > void fix_length_and_dec(); > void fix_after_pullout(st_select_lex *new_parent, Item **ref); > + bool const_pred() const { return const_item() && left_expr->const_item(); } > void update_used_tables(); > bool setup_mat_engine(); > bool init_left_expr_cache(); > > === modified file 'sql/opt_subselect.cc' > --- a/sql/opt_subselect.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/opt_subselect.cc 2012-05-11 15:25:03 +0000 > @@ -4872,7 +4872,43 @@ static void remove_subq_pushed_predicate > > bool JOIN::optimize_unflattened_subqueries() > { > - return select_lex->optimize_unflattened_subqueries(); > + return select_lex->optimize_unflattened_subqueries(false); > +} > + > +/** > + Optimize all constant subqueries of a query that were not flattened into > + a semijoin. > + > + @details > + Similar to other constant conditions, constant subqueries can be used in > + various constant optimizations. Having optimized constant subqueries before > + these constant optimizations, makes it possible to estimate if a subquery > + is "cheap" enough to be executed during the optimization phase. > + > + Constant subqueries can be optimized and evaluated independent of the outer > + query, therefore if const_only = true, this method can be called early in > + the optimization phase of the outer query. > + > + @return Operation status > + @retval FALSE success. > + @retval TRUE error occurred. > +*/ > + > +bool JOIN::optimize_constant_subqueries() > +{ > + ulonglong save_options= select_lex->options; > + bool res; > + /* > + Constant subqueries may be executed during the optimization phase. > + In EXPLAIN mode the optimizer doesn't initialize many of the data structures > + needed for execution. In order to make it possible to execute subqueries > + during optimization, constant subqueries must be optimized for execution, > + not for EXPLAIN. > + */ > + select_lex->options&= ~SELECT_DESCRIBE; > + res= select_lex->optimize_unflattened_subqueries(true); > + select_lex->options= save_options; > + return res; > } > > > @@ -5273,7 +5309,14 @@ bool JOIN::choose_subquery_plan(table_ma > by the IN predicate. > */ > outer_join= unit->outer_select() ? unit->outer_select()->join : NULL; > - if (outer_join && outer_join->table_count > 0) > + /* > + Get the cost of the outer join if: > + (1) It has at least one table, and > + (2) It has been already optimized (if there is no join_tab, then the > + outer join has not been optimized yet). > + */ > + if (outer_join && outer_join->table_count > 0 && // (1) > + outer_join->join_tab) // (2) > { > /* > TODO: > > === modified file 'sql/sql_class.h' > --- a/sql/sql_class.h 2012-03-11 22:45:18 +0000 > +++ b/sql/sql_class.h 2012-05-11 15:25:03 +0000 > @@ -482,6 +482,7 @@ typedef struct system_variables > ulonglong group_concat_max_len; > ha_rows select_limit; > ha_rows max_join_size; > + ha_rows expensive_subquery_limit; > ulong auto_increment_increment, auto_increment_offset; > ulong lock_wait_timeout; > ulong join_cache_level; > > === modified file 'sql/sql_delete.cc' > --- a/sql/sql_delete.cc 2012-03-24 17:21:22 +0000 > +++ b/sql/sql_delete.cc 2012-05-11 15:25:03 +0000 > @@ -120,7 +120,7 @@ bool mysql_delete(THD *thd, TABLE_LIST * > } > > /* Apply the IN=>EXISTS transformation to all subqueries and optimize them. */ > - if (select_lex->optimize_unflattened_subqueries()) > + if (select_lex->optimize_unflattened_subqueries(false)) > DBUG_RETURN(TRUE); > > const_cond= (!conds || conds->const_item()); > > === modified file 'sql/sql_lex.cc' > --- a/sql/sql_lex.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/sql_lex.cc 2012-05-11 15:25:03 +0000 > @@ -3405,7 +3405,23 @@ bool st_select_lex::add_index_hint (THD > } > > > -bool st_select_lex::optimize_unflattened_subqueries() > +/** > + Optimize all subqueries that have not been flattened into semi-joins. > + > + @details > + This functionality is a method of SELECT_LEX instead of JOIN because > + SQL statements as DELETE/UPDATE do not have a corresponding JOIN object. > + > + @see JOIN::optimize_unflattened_subqueries > + > + @param const_only Restrict subquery optimization to constant subqueries > + > + @return Operation status > + @retval FALSE success. > + @retval TRUE error occurred. > +*/ > + > +bool st_select_lex::optimize_unflattened_subqueries(bool const_only) > { > for (SELECT_LEX_UNIT *un= first_inner_unit(); un; un= un->next_unit()) > { > @@ -3415,11 +3431,17 @@ bool st_select_lex::optimize_unflattened > { > if (subquery_predicate->substype() == Item_subselect::IN_SUBS) > { > - Item_in_subselect *in_subs=(Item_in_subselect*)subquery_predicate; > + Item_in_subselect *in_subs= (Item_in_subselect*) subquery_predicate; > if (in_subs->is_jtbm_merged) > continue; > } > > + if (const_only && !subquery_predicate->const_pred()) > + { > + /* Skip non-constant subqueries if the caller asked so. */ > + continue; > + } > + > bool empty_union_result= true; > /* > If the subquery is a UNION, optimize all the subqueries in the UNION. If > > === modified file 'sql/sql_lex.h' > --- a/sql/sql_lex.h 2012-04-10 06:28:13 +0000 > +++ b/sql/sql_lex.h 2012-05-11 15:25:03 +0000 > @@ -997,12 +997,7 @@ class st_select_lex: public st_select_le > > void clear_index_hints(void) { index_hints= NULL; } > bool is_part_of_union() { return master_unit()->is_union(); } > - /* > - Optimize all subqueries that have not been flattened into semi-joins. > - This functionality is a method of SELECT_LEX instead of JOIN because > - some SQL statements as DELETE do not have a corresponding JOIN object. > - */ > - bool optimize_unflattened_subqueries(); > + bool optimize_unflattened_subqueries(bool const_only); > /* Set the EXPLAIN type for this subquery. */ > void set_explain_type(); > bool handle_derived(LEX *lex, uint phases); > > === modified file 'sql/sql_select.cc' > --- a/sql/sql_select.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/sql_select.cc 2012-05-11 15:25:03 +0000 > @@ -986,7 +986,10 @@ JOIN::optimize() > } > > eval_select_list_used_tables(); > - > + > + if (optimize_constant_subqueries()) > + DBUG_RETURN(1); > + > table_count= select_lex->leaf_tables.elements; > > if (setup_ftfuncs(select_lex)) /* should be after having->fix_fields */ > @@ -1273,6 +1276,12 @@ JOIN::optimize() > { > conds= substitute_for_best_equal_field(NO_PARTICULAR_TAB, conds, > cond_equal, map2table); > + if (thd->is_error()) > + { > + error= 1; > + DBUG_PRINT("error",("Error from substitute_for_best_equal")); > + DBUG_RETURN(1); > + } > conds->update_used_tables(); > DBUG_EXECUTE("where", > print_where(conds, > @@ -1293,6 +1302,12 @@ JOIN::optimize() > *tab->on_expr_ref, > tab->cond_equal, > map2table); > + if (thd->is_error()) > + { > + error= 1; > + DBUG_PRINT("error",("Error from substitute_for_best_equal")); > + DBUG_RETURN(1); > + } > (*tab->on_expr_ref)->update_used_tables(); > } > } > @@ -6592,6 +6607,36 @@ void JOIN::get_prefix_cost_and_fanout(ui > > > /** > + Estimate the number of rows that query execution will read. > + > + @todo This is a very pessimistic upper bound. Use join selectivity > + when available to produce a more realistic number. > +*/ > + > +double JOIN::get_examined_rows() > +{ > + /* Each constant table examines one row, and the result is at most one row. */ > + ha_rows examined_rows= const_tables; > + uint i= const_tables; > + double prev_fanout; > + > + if (table_count == const_tables) > + return examined_rows; > + > + examined_rows+= join_tab[i++].get_examined_rows(); > + for (; i < table_count ; i++) > + { > + if (join_tab[i].type == JT_EQ_REF) > + prev_fanout= 1; > + else > + prev_fanout= best_positions[i-1].records_read; This looks wrong. Declaration of POSITION::records_read has this comment: /* The "fanout": number of output rows that will be produced (after pushed down selection condition is applied) per each row combination of previous tables. */ note the "PER EACH ROW COMBINATION .." part. I would expect that this function would calculate a product of records_read values. > + examined_rows+= join_tab[i].get_examined_rows() * prev_fanout; > + } > + return examined_rows; > +} > + > + > +/** > Find a good, possibly optimal, query execution plan (QEP) by a possibly > exhaustive search. > > @@ -8011,36 +8056,15 @@ JOIN::make_simple_join(JOIN *parent, TAB > row_limit= unit->select_limit_cnt; > do_send_rows= row_limit ? 1 : 0; > > - join_tab->use_join_cache= FALSE; > - join_tab->cache=0; /* No caching */ > + bzero(join_tab, sizeof(JOIN_TAB)); > join_tab->table=temp_table; > - join_tab->cache_select= 0; > - join_tab->select=0; > - join_tab->select_cond= 0; // Avoid valgrind warning > join_tab->set_select_cond(NULL, __LINE__); > - join_tab->quick=0; > join_tab->type= JT_ALL; /* Map through all records */ > join_tab->keys.init(); > join_tab->keys.set_all(); /* test everything in quick */ > - join_tab->info=0; > - join_tab->on_expr_ref=0; > - join_tab->last_inner= 0; > - join_tab->first_unmatched= 0; > join_tab->ref.key = -1; > - join_tab->not_used_in_distinct=0; > join_tab->read_first_record= join_init_read_record; > - join_tab->preread_init_done= FALSE; > join_tab->join= this; > - join_tab->ref.key_parts= 0; > - join_tab->keep_current_rowid= FALSE; > - join_tab->flush_weedout_table= join_tab->check_weed_out_table= NULL; > - join_tab->do_firstmatch= NULL; > - join_tab->loosescan_match_tab= NULL; > - join_tab->emb_sj_nest= NULL; > - join_tab->pre_idx_push_select_cond= NULL; > - join_tab->bush_root_tab= NULL; > - join_tab->bush_children= NULL; > - join_tab->last_leaf_in_bush= FALSE; > bzero((char*) &join_tab->read_record,sizeof(join_tab->read_record)); > temp_table->status=0; > temp_table->null_row=0; > @@ -10225,6 +10249,51 @@ double JOIN_TAB::scan_time() > return res; > } > > + > +/** > + Estimate the number of rows that a an access method will read from a table. > + > + @todo: why not use JOIN_TAB::found_records > +*/ > + > +ha_rows JOIN_TAB::get_examined_rows() > +{ > + ha_rows examined_rows; > + > + if (select && select->quick) > + examined_rows= select->quick->records; > + else if (type == JT_NEXT || type == JT_ALL || > + type == JT_HASH || type ==JT_HASH_NEXT) > + { > + if (limit) > + { > + /* > + @todo This estimate is wrong, a LIMIT query may examine much more rows > + than the LIMIT itself. > + */ > + examined_rows= limit; > + } > + else > + { > + if (table->is_filled_at_execution()) > + examined_rows= records; > + else > + { > + /* > + handler->info(HA_STATUS_VARIABLE) has been called in > + make_join_statistics() > + */ > + examined_rows= table->file->stats.records; > + } > + } > + } > + else > + examined_rows= (ha_rows) records_read; > + > + return examined_rows; > +} > + > + > /** > Initialize the join_tab before reading. > Currently only derived table/view materialization is done here. > @@ -11204,9 +11273,9 @@ static bool check_simple_equality(Item * > if (!item) > { > Item_func_eq *eq_item; > - if ((eq_item= new Item_func_eq(orig_left_item, orig_right_item))) > + if (!(eq_item= new Item_func_eq(orig_left_item, orig_right_item)) || > + eq_item->set_cmp_func()) > return FALSE; > - eq_item->set_cmp_func(); > eq_item->quick_fix_field(); > item= eq_item; > } > @@ -11299,9 +11368,9 @@ static bool check_row_equality(THD *thd, > if (!is_converted) > { > Item_func_eq *eq_item; > - if (!(eq_item= new Item_func_eq(left_item, right_item))) > + if (!(eq_item= new Item_func_eq(left_item, right_item)) || > + eq_item->set_cmp_func()) > return FALSE; > - eq_item->set_cmp_func(); > eq_item->quick_fix_field(); > eq_list->push_back(eq_item); > } > @@ -11987,9 +12056,8 @@ Item *eliminate_item_equal(COND *cond, C > > eq_item= new Item_func_eq(field_item->real_item(), head_item); > > - if (!eq_item) > + if (!eq_item || eq_item->set_cmp_func()) > return 0; > - eq_item->set_cmp_func(); > eq_item->quick_fix_field(); > } > current_sjm= field_sjm; > @@ -12076,7 +12144,7 @@ Item *eliminate_item_equal(COND *cond, C > Item_equal::get_first() for details. > > @return > - The transformed condition > + The transformed condition, or NULL in case of error > */ > > static COND* substitute_for_best_equal_field(JOIN_TAB *context_tab, > @@ -18544,6 +18612,7 @@ check_reverse_order: > tab->ref.key_parts= 0; > if (select_limit < table->file->stats.records) > tab->limit= select_limit; > + table->disable_keyread(); ^^^ This change looks weird. Let's discuss it. > } > } > else if (tab->type != JT_ALL) > @@ -21269,10 +21338,17 @@ static void select_describe(JOIN *join, > } > else > { > - TABLE_LIST *real_table= table->pos_in_table_list; > - item_list.push_back(new Item_string(real_table->alias, > - strlen(real_table->alias), > - cs)); > + TABLE_LIST *real_table= table->pos_in_table_list; > + /* > + Internal temporary tables have no corresponding table reference > + object. Such a table may appear in EXPLAIN when a subquery that needs > + a temporary table has been executed, and JOIN::exec replaced the > + original JOIN with a plan to access the data in the temp table > + (made by JOIN::make_simple_join). > + */ > + const char *tab_name= real_table ? real_table->alias : > + "internal_tmp_table"; > + item_list.push_back(new Item_string(tab_name, strlen(tab_name), cs)); > } > /* "partitions" column */ > if (join->thd->lex->describe & DESCRIBE_PARTITIONS) > @@ -21430,32 +21506,8 @@ static void select_describe(JOIN *join, > } > else > { > - ha_rows examined_rows; > - if (tab->select && tab->select->quick) > - examined_rows= tab->select->quick->records; > - else if (tab->type == JT_NEXT || tab->type == JT_ALL || is_hj) > - { > - if (tab->limit) > - examined_rows= tab->limit; > - else > - { > - if (tab->table->is_filled_at_execution()) > - { > - examined_rows= tab->records; > - } > - else > - { > - /* > - handler->info(HA_STATUS_VARIABLE) has been called in > - make_join_statistics() > - */ > - examined_rows= tab->table->file->stats.records; > - } > - } > - } > - else > - examined_rows=(ha_rows)tab->records_read; > - > + ha_rows examined_rows= tab->get_examined_rows(); > + > item_list.push_back(new Item_int((longlong) (ulonglong) examined_rows, > MY_INT64_NUM_DECIMAL_DIGITS)); > > > === modified file 'sql/sql_select.h' > --- a/sql/sql_select.h 2012-05-04 05:16:38 +0000 > +++ b/sql/sql_select.h 2012-05-11 15:25:03 +0000 > @@ -512,6 +512,7 @@ typedef struct st_join_table { > return (is_hash_join_key_no(key) ? hj_key : table->key_info+key); > } > double scan_time(); > + ha_rows get_examined_rows(); > bool preread_init(); > > bool is_sjm_nest() { return test(bush_children); } > @@ -1281,6 +1282,7 @@ class JOIN :public Sql_alloc > bool alloc_func_list(); > bool flatten_subqueries(); > bool optimize_unflattened_subqueries(); > + bool optimize_constant_subqueries(); > bool make_sum_func_list(List<Item> &all_fields, List<Item> &send_fields, > bool before_group_by, bool recompute= FALSE); > > @@ -1380,6 +1382,7 @@ class JOIN :public Sql_alloc > void get_prefix_cost_and_fanout(uint n_tables, > double *read_time_arg, > double *record_count_arg); > + double get_examined_rows(); > /* defined in opt_subselect.cc */ > bool transform_max_min_subquery(); > /* True if this JOIN is a subquery under an IN predicate. */ > > === modified file 'sql/sql_update.cc' > --- a/sql/sql_update.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/sql_update.cc 2012-05-11 15:25:03 +0000 > @@ -368,7 +368,7 @@ int mysql_update(THD *thd, > } > > /* Apply the IN=>EXISTS transformation to all subqueries and optimize them. */ > - if (select_lex->optimize_unflattened_subqueries()) > + if (select_lex->optimize_unflattened_subqueries(false)) > DBUG_RETURN(TRUE); > > if (select_lex->inner_refs_list.elements && > > === modified file 'sql/sys_vars.cc' > --- a/sql/sys_vars.cc 2012-04-19 14:00:13 +0000 > +++ b/sql/sys_vars.cc 2012-05-11 15:25:03 +0000 > @@ -3780,4 +3780,9 @@ static Sys_var_ulong Sys_debug_binlog_fs > CMD_LINE(REQUIRED_ARG), > VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); > #endif > - > +static Sys_var_harows Sys_expensive_subquery_limit( > + "expensive_subquery_limit", > + "The maximum number of rows a subquery examines in order to be " > + "considered non-expensive", > + SESSION_VAR(expensive_subquery_limit), CMD_LINE(REQUIRED_ARG), > + VALID_RANGE(0, HA_POS_ERROR), DEFAULT(100), BLOCK_SIZE(1)); > > === modified file 'sql/table.cc' > --- a/sql/table.cc 2012-05-04 05:16:38 +0000 > +++ b/sql/table.cc 2012-05-11 15:25:03 +0000 > @@ -5985,7 +5985,8 @@ void TABLE::use_index(int key_to_save) > > bool TABLE::is_filled_at_execution() > { > - return test(pos_in_table_list->jtbm_subselect || > + return test(!pos_in_table_list || > + pos_in_table_list->jtbm_subselect || > pos_in_table_list->is_active_sjm()); Could you please add a comment for pos_in_table_list that it can be NULL for some tables? (I assume you still remember what kind of tables have pos_in_table_list==NULL?) > } > > A general question: was this expected to work: MariaDB [j3]> explain extended select * from t1 where 33 in (select b from five) or c > 11; +------+--------------------+-------+------+---------------+------+---------+------+------+----------+-------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | filtered | Extra | +------+--------------------+-------+------+---------------+------+---------+------+------+----------+-------------+ | 1 | PRIMARY | t1 | ALL | NULL | NULL | NULL | NULL | 10 | 100.00 | Using where | | 2 | DEPENDENT SUBQUERY | five | ALL | NULL | NULL | NULL | NULL | 5 | 100.00 | Using where | +------+--------------------+-------+------+---------------+------+---------+------+------+----------+-------------+ 2 rows in set, 1 warning (22 min 25.44 sec) The subuqery is constant, table `five` has 5 records, and none of them has b=33. When debugging, I see JOIN::get_examined_rows() to be invoked and it returns 5 rows, but EXPLAIN still doesn't show "Impossible WHERE"? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 1

[Maria-developers] Question about Query plan
by Markus Pilman 14 May '12

14 May '12

Hello all, At ETH Zurich we are working on a new storage engine, that allows us to test several new architectures for transactional databases. So far we worked with MySQL, but we had massive performance issues. After some investigation we figured out, that MySQL generates different query plans for InnoDB than for our engine. One query which killed our performance was the following (this is a query from the TPC-W benchmark): SELECT ol2.ol_i_id, SUM(ol2.ol_qty) AS sum_ol FROM order_line ol, order_line ol2, (SELECT o_id FROM orders ORDER BY o_date DESC LIMIT 10000) AS t WHERE ol.ol_o_id = t.o_id AND ol.ol_i_id = 10 AND ol2.ol_o_id = t.o_id AND ol2.ol_i_id <> 10 GROUP BY ol2.ol_i_id ORDER BY sum_ol DESC LIMIT 0,5 MySQL generated the following plan for InnoDB: +----+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +----+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ | 1 | PRIMARY | <derived2> | ALL | NULL | NULL | NULL | NULL | 10000 | Using temporary; Using filesort | | 1 | PRIMARY | ol | ref | orderline_o_id,orderline_i_id | orderline_o_id | 8 | t.o_id | 1 | Using where | | 1 | PRIMARY | ol2 | ref | orderline_o_id,orderline_i_id | orderline_o_id | 8 | tpcw.ol.OL_O_ID | 1 | Using where | | 2 | DERIVED | orders | index | NULL | orders_o_date | 4 | NULL | 10000 | Using index | +----+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ while it generated the following one for our storage engine: +----+-------------+------------+-------+-------------------------------+----------------+---------+-------+-------+----------------------------------------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +----+-------------+------------+-------+-------------------------------+----------------+---------+-------+-------+----------------------------------------------+ | 1 | PRIMARY | ol | ref | orderline_o_id,orderline_i_id | orderline_i_id | 5 | const | 10 | Using where; Using temporary; Using filesort | | 1 | PRIMARY | ol2 | range | orderline_o_id,orderline_i_id | orderline_i_id | 5 | NULL | 20 | Using where; Using join buffer | | 1 | PRIMARY | <derived2> | ALL | NULL | NULL | NULL | NULL | 10000 | Using where; Using join buffer | | 2 | DERIVED | orders | index | NULL | orders_o_date | 4 | NULL | 10000 | | +----+-------------+------------+-------+-------------------------------+----------------+---------+-------+-------+----------------------------------------------+ The second one is obviously a very bad one. So we decided to try with MariaDB, which generates the following query plan: +------+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | Extra | +------+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ | 1 | PRIMARY | ol | ref | orderline_o_id,orderline_i_id | orderline_i_id | 5 | const | 10 | Using temporary; Using filesort | | 1 | PRIMARY | ol2 | ref | orderline_o_id,orderline_i_id | orderline_o_id | 8 | test.ol.OL_O_ID | 11 | Using where | | 1 | PRIMARY | <derived2> | ref | key0 | key0 | 8 | test.ol.OL_O_ID | 10 | | | 2 | DERIVED | orders | index | NULL | orders_o_date | 4 | NULL | 10000 | | +------+-------------+------------+-------+-------------------------------+----------------+---------+-----------------+-------+---------------------------------+ The query plan from MariaDB looks sane to me, and the numbers approve this (the query runs on a middle sized data set about 200 times faster with MariaDB than with MySQL). So we will continue our work with MariaDB. But I have a question to these query plans: why are we getting this differences in MySQL between our storage engine and InnoDB? Is there a feature in our storage engine missing (we first thought we need the ability to support HA_KEYREAD_ONLY - but implementing this feature did not change the query plan)? Or does MySQL some kind of "cheating"? We should understand this issue to be able to present our results we get later (may be we will compare MariaDB and MySQL, but in a paper we would have to explain why MySQL sucks that much). And btw: good work with MariaDB!! The optimizer seems to do a much better job than MySQL - even with InnoDB/XtraDB (we had to rewrite some queries in MySQL to force it to generate sane query plans - with MariaDB this does not seem to be necessary anymore). Thanks for your help in advance and best regards Markus

2 4

Re: [Maria-developers] Review request for: [Commits] Rev 3403: Fix for bug lp:944706, task MDEV-193 in file:///home/tsk/mprog/src/5.5-lpb944706/
by Sergei Petrunia 14 May '12

14 May '12

On Sun, May 13, 2012 at 02:11:15PM +0300, Timour Katchaounov wrote: > === modified file 'sql/sys_vars.cc' > --- a/sql/sys_vars.cc 2012-04-19 14:00:13 +0000 > +++ b/sql/sys_vars.cc 2012-05-11 15:25:03 +0000 > @@ -3780,4 +3780,9 @@ static Sys_var_ulong Sys_debug_binlog_fs > CMD_LINE(REQUIRED_ARG), > VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1)); > #endif > - > +static Sys_var_harows Sys_expensive_subquery_limit( > + "expensive_subquery_limit", > + "The maximum number of rows a subquery examines in order to be " > + "considered non-expensive", > + SESSION_VAR(expensive_subquery_limit), CMD_LINE(REQUIRED_ARG), > + VALID_RANGE(0, HA_POS_ERROR), DEFAULT(100), BLOCK_SIZE(1)); "considered non-expensive" may not mean much for the outside user. Please change the wording to explicitly say that subqueries that enumerate less than expensive_subquery_limit rows may be evaluated at the optimization phase. Which version will this fix be pushed to? 5.5-ga? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] federated bug: Bug #61526 create table .. like .. federated table crashes with auto_increment column
by xiaobing jiang 14 May '12

14 May '12

hi all: I try to fix the bug: http://bugs.mysql.com/bug.php?id=61526. but after dig the code, I found that the federated seems don't support "create table xx like yy". the function miss the "share->connect_string", so it always report: ERROR 1 (HY000): server name: '' doesn't exist! from the page: http://kb.askmonty.org/en/about-federatedx, it says: The FederatedX Storage Engine is a fork of the Federated Storage Engine, the latter of the two no longer being maintained by Oracle. The purpose of FederatedX is to keep this storage engine's development progressing-- to both add new features as well as fix old bugs. is it really? so will oracle accept the patch? Thanks!

3 4

Re: [Maria-developers] Added --continue-on-error to mysqltest and mysql-test-run in lp:maria/5.5
by Sergei Golubchik 12 May '12

12 May '12

Hi, Monty! On May 04, Michael Widenius wrote: > At lp:maria/5.5 > > ------------------------------------------------------------ > revno: 3393 > revision-id: monty(a)askmonty.org-20120504133709-w1l2t1vhvpqupu3v > parent: monty(a)askmonty.org-20120503130041-fb9myku0uh1qybty > committer: Michael Widenius <monty(a)askmonty.org> > branch nick: maria-5.5 > timestamp: Fri 2012-05-04 16:37:09 +0300 > message: > Added --continue-on-error to mysqltest and mysql-test-run > This will contune the test case even if there was an error. This makes it easier to run a test that contains many sub tests against one engine. First, you forgot to test the new feature. see mysqltest.test for examples > === modified file 'client/mysqltest.cc' > --- a/client/mysqltest.cc 2012-02-23 06:50:11 +0000 > +++ b/client/mysqltest.cc 2012-05-04 13:37:09 +0000 > @@ -1746,9 +1791,15 @@ static int diff_check(const char *diff_n > my_snprintf(buf, sizeof(buf), "%s -v", diff_name); > > if (!(res_file= popen(buf, "r"))) > - die("popen(\"%s\", \"r\") failed", buf); > + { > + report_or_die("popen(\"%s\", \"r\") failed", buf); > + return; > + } I doubt it makes sense to continue in this case > - /* if diff is not present, nothing will be in stdout to increment have_diff */ > + /* > + if diff is not present, nothing will be in stdout to increment > + have_diff > + */ > if (fgets(buf, sizeof(buf), res_file)) > have_diff= 1; > > @@ -2069,9 +2120,13 @@ void check_result() > > switch (compare_files(log_file.file_name(), result_file_name)) { > case RESULT_OK: > - break; /* ok */ > + if (!error_count) > + break; /* ok */ > + mess= "Got errors while running test"; I wonder whether you need it. As the error goes into the result, it'll inevitably end up in the .reject file. one can get RESULT_OK only if the same error is present in the .result file. But in this case you won't increment error_count, because an error in the result file means --error directive. > + /* Fallthrough */ > case RESULT_LENGTH_MISMATCH: > - mess= "Result length mismatch\n"; > + if (!mess) > + mess= "Result length mismatch\n"; > /* Fallthrough */ > case RESULT_CONTENT_MISMATCH: > { > @@ -3240,8 +3319,10 @@ void do_exec(struct st_command *command) > log_msg("exec of '%s' failed, error: %d, status: %d, errno: %d", > ds_cmd.str, error, status, errno); > dynstr_free(&ds_cmd); > - die("command \"%s\" failed\n\nOutput from before failure:\n%s\n", > - command->first_argument, ds_res.str); > + if (!opt_continue_on_error) > + die("command \"%s\" failed\n\nOutput from before failure:\n%s\n", > + command->first_argument, ds_res.str); why not report_or_die ? > + return; > } > > DBUG_PRINT("info", > @@ -3941,12 +4030,12 @@ void read_until_delimiter(DYNAMIC_STRING > No characters except \n are allowed on > the same line as the command > */ > - die("Trailing characters found after command"); > + report_or_die("Trailing characters found after command"); I think --continue-on-error should not affect syntax errors in the test script itself. They should always abort the execution. in general, you've documented the new option as "This is mostly useful when testing a storage engine and one wants to see how much of a multi-test file it can execute." which is also what BigFish wanted it to do. So, most (if not all) mysqltest failures not related to a storage engine should not be ignored. > } > > if (feof(cur_file->file)) > - die("End of file encountered before '%s' delimiter was found", > - ds_delimiter->str); > + report_or_die("End of file encountered before '%s' delimiter was found", > + ds_delimiter->str); > > if (match_delimiter(c, ds_delimiter->str, ds_delimiter->length)) > { > === modified file 'mysql-test/mysql-test-run.pl' > --- a/mysql-test/mysql-test-run.pl 2012-05-03 13:00:41 +0000 > +++ b/mysql-test/mysql-test-run.pl 2012-05-04 13:37:09 +0000 > @@ -5805,6 +5807,11 @@ sub start_mysqltest ($) { > mtr_add_arg($args, "--max-connections=%d", $opt_max_connections); > } > > + if ($opt_continue_on_error) > + { > + mtr_add_arg($args, "--continue-on-error"); I think this should enable --force too. or, perhaps, --force should enable this and one does not need a separate --continue-on-error in mtr. > + } > + > if ( $opt_embedded_server ) > { > Regards, Sergei

1 0

[Maria-developers] Request for testing: MWL#182 SHOW EXPLAIN
by Sergei Petrunia 11 May '12

11 May '12

Hi Elena, I need testing for MWL#182 SHOW EXPLAIN. The code is here: lp:~maria-captains/maria/5.3-show-explain2 (note the '2' at the end) The branch is currently based on 5.3, although will move to 5.5 soon (I suppose this doesn't cause any problems for testing). Currently, I can think of two things that need testing: === "Asynchronous Procedure Call" module === This is a module that allows one thread to schedule a call in the other thread, and wait until the call has been invoked. Suggested way to test: - run a set of queries that look at each other with "SHOW EXPLAIN FOR <thread>" statements. - have some "victim" threads which run long queries, and have "attacker" threads which submit a lot of "SHOW EXPLAIN FOR <victim_thread>" queries. === On-the-fly EXPLAIN printing functionality === Before this WL, the code that produced EXPLAIN output - Required that optimizer produces a slightly different structures when EXPLAIN is running - Did destructive modifications to the query plan (that is, it was not possible to call these functions two times to get two EXPLAIN outputs for the same planned query) Suggested way to test: - Run various complicated queries, with UNIONs, JOINs, etc. - While they are running, do SHOW EXPLAIN FOR command for them, expecting it to crash or produce nonsensical output at some point. If SHOW EXPLAIN crashes, the crash report will show the query it was trying to obtain the EXPLAIN for. My current suggestion is to use some "runner" threads to run the queries and use another set of threads to hit the "runner" threads with SHOW EXPLAIN request. When creating tests in mysql-test/t/show_explain.test, I made a framework that allows to stop query execution at some particular point and then wait until some number of SHOW EXPLAIN requests were arrived and served. This requires insertion of "probes" into the source code, though. Perhaps, we could use something like that for your testing: to have the query pause at some "interesting" points and wait for SHOW EXPLAIN requests to arrive and be served. I wasn't able to come up with any intelligent way to find interesting point though, so this is still just an idea. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 1

Re: [Maria-developers] Added --continue-on-error to mysqltest and mysql-test-run
by Sergei Golubchik 07 May '12

07 May '12

Hi, Monty! On May 04, Michael Widenius wrote: > At lp:maria/5.5 > > ------------------------------------------------------------ > revno: 3393 > committer: Michael Widenius <monty(a)askmonty.org> > branch nick: maria-5.5 > message: > Added --continue-on-error to mysqltest and mysql-test-run > This will contune the test case even if there was an error. This > makes it easier to run a test that contains many sub tests against > one engine. Monty, why did you do your parallel implementation of this feature, instead of using the existing abort_on_error flag? Regards, Sergei

1 0

Re: [Maria-developers] MDEV-255: Compile handlersocket plugin in 5.5
by Sergei Golubchik 07 May '12

07 May '12

Hi, Vladislav! On May 05, Vladislav Vaintroub wrote: > ------------------------------------------------------------ > revno: 3398 > revision-id: wlad(a)montyprogram.com-20120505003610-rz89d70v8c6n5v0c > parent: wlad(a)montyprogram.com-20120504152240-ptie9ox0vjqqukd4 > committer: Vladislav Vaintroub <wlad(a)montyprogram.com> > branch nick: 5.5 > timestamp: Sat 2012-05-05 02:36:10 +0200 > message: > MDEV-255: Compile handlersocket plugin in 5.5 > === added file 'plugin/handler_socket/CMakeLists.txt' > --- a/plugin/handler_socket/CMakeLists.txt 1970-01-01 00:00:00 +0000 > +++ b/plugin/handler_socket/CMakeLists.txt 2012-05-05 00:36:10 +0000 > @@ -0,0 +1,41 @@ > + > +IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") > + # Handlersocket does not compile on Windows, compiles but does > + # not start on FreeBSD. Why does it not start of BSD? > + RETURN() > +ENDIF() > + > +#Remove -fno-implicit-templates from compiler flags(handlersocket would not work with it) > +IF(CMAKE_COMPILER_IS_GNUCXX) > + STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) Do we still compile with -fno-implicit-templates? I thought we don't use it anymore. We shouldn't. > +ENDIF() > + > === modified file 'plugin/handler_socket/handlersocket/mysql_incl.hpp' > --- a/plugin/handler_socket/handlersocket/mysql_incl.hpp 2011-06-07 11:19:49 +0000 > +++ b/plugin/handler_socket/handlersocket/mysql_incl.hpp 2012-05-05 00:36:10 +0000 > @@ -13,7 +13,10 @@ > #define HAVE_CONFIG_H > #endif > > +#ifndef MYSQL_DYNAMIC_PLUGIN > #define MYSQL_DYNAMIC_PLUGIN > +#endif I prefer not to have #ifdef, but instead write #define MYSQL_DYNAMIC_PLUGIN 1 you apparently got macro redefinition warning, right? Because there was -DMYSQL_DYNAMIC_PLUGIN on the gcc command line? It defines MYSQL_DYNAMIC_PLUGIN to be 1, and when it's redefined in the source to the empty string you get a warning. "Redefining" it to the same value of 1 is okay, there will be no warning for it. That's why all such symbols should be defined to 1, not to an empty string. > + > #define MYSQL_SERVER 1 > Regards, Sergei

2 2

[Maria-developers] KB Question: Ubuntu 10.04 LTS Server and MariaDB 5.5.23
by Daniel Bartholomew 07 May '12

07 May '12

A question has been posted to the Knowledgebase: http://kb.askmonty.org/en/ubuntu-1004-lts-server-and-mariadb-5523 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ubuntu 10.04 LTS Server and MariaDB 5.5.23 After installing fresh mariadb, I'm having troubles using some software compiled with the mysql support. For ex. mysql2 ruby gem: Incorrect MySQL client library version! This gem was compiled for 5.5.23-MariaDB but the client library is 5.1.61 Quick investigation took me into this conclusions: mariadb-client-5.5 introduces new libmariadbclient18, but depends on libdbd-mysql-perl which depends on libmysqlclient16. So after install we have 2 libraries: libmysqlclient.so.16(from original mysql) and libmysqlclient.so.18(from mariadb). And default libmysqlclient.so is symlinked to libmysqlclient.so.16 Can this be solved in some way? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

2 1

[Maria-developers] A question about JOIN re-execution by subquery code
by Sergei Petrunia 07 May '12

07 May '12

Hi Sanja, As far I understand, JOIN structure has two "modules" to support join re-execution: M1. save_join_tab() saves/restores the contents of JOIN::join_tab array, as if execution process changed JOIN_TAB structures M2. JOIN::tmp_join is used to save/restore the contents of JOIN structure itself. What puzzles me are two questions: Q1: Why do we have separate functions to M1 and M2, instead of one "save everything" call, and one "restore everything" call? Q2: Why does M1 copy the whole JOIN_TAB structures? I've made a patch which makes it to save/restore JOIN::join_tab pointer instead (attached), and it passed all tests in the main test suite. (I am asking all this in connection with bug MDEV-238 on MWL#182 code) BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] MariaDB 5.3.7 release prep
by Daniel Bartholomew 04 May '12

04 May '12

All, The packages and other files for MariaDB 5.3.7 have been uploaded to the primary mirror and we're waiting for the other mirrors to pick up the new files before announcing the release. I've created preliminary changelog and release notes pages for the release here: http://kb.askmonty.org/en/mariadb-537-release-notes http://kb.askmonty.org/en/mariadb-537-changelog From the changelog, it appears this is primarily a bug-fix release. If there are any particularly notable bugs or features of this release which I should make mention of in the release notes, let me know ASAP. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] proposed patch for handler APIs for range query information
by Zardosht Kasheff 02 May '12

02 May '12

Hello all, After talking with Colin Charles last night, I have been encouraged to send more patches for MariaDB. Here is a hopefully simple one that benefits all storage engines. Attached is a proposed patch of new handler APIs. The purpose of this patch is to give storage engines more information about impending range queries. The idea is if MySQL is about to perform a range query from a to b, then the handler is informed that a range query is about to happen. It extends functionality like handler::prepare_index_scan to other scenarios. We use it to know how much data to prefetch and prelock before doing a range query. Any storage engine can use this as a heuristic for optimizing range query performance. I would love to hear feedback -Zardosht

2 2

[Maria-developers] KB Question: Aria features ?
by Daniel Bartholomew 30 Apr '12

30 Apr '12

A question has been posted to the Knowledgebase: http://kb.askmonty.org/en/aria-features - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Aria features ? When Aria Engine is a new generation MyISAM Engine , whether the new features: - parallel index creating? - merge table? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] KB question: parallel index creating
by Daniel Bartholomew 30 Apr '12

30 Apr '12

A question has been posted to the Knowledgebase: http://kb.askmonty.org/en/parallel-index-creating - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - parallel index creating? Hi all can we expect the creation of parallel index creating in MyISAM engine? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] Request for testing: MWL#182 SHOW EXPLAIN
by Sergei Petrunia 27 Apr '12

27 Apr '12

On Fri, Apr 27, 2012 at 01:31:08PM +0400, Elena Stepanova wrote: > Hi Sergey, > > OK, I will start working on this. > > > Before this WL, the code that produced EXPLAIN output > > - Required that optimizer produces a slightly different structures > > when EXPLAIN is running > > - Did destructive modifications to the query plan > > Does this mean that the traditional EXPLAIN (preceding a statement or > subsequent to it) is also affected? > Yes. I've changed regular EXPLAIN code so that it can be ran multiple times. That way, traditional EXPLAIN is affected. There is one known difference, currently only documented in this e-mail (will forward it): Date: Sat, 27 Aug 2011 10:14:13 +0400 From: Sergey Petrunya <psergey(a)askmonty.org> To: maria-developers(a)lists.launchpad.net Subject: [Maria-developers] MWL#182: a problem select_type column, SIMPLE vs PRIMARY > By the way, s there any standard way of naming the new EXPLAIN, as > opposed to the old EXPLAIN? (e.g. Online EXPLAIN? Asynchronous? Running? > Parallel?) > This is just to simplify further talks. We call it "SHOW EXPLAIN", following the SQL syntax. Nobody has made an explicit decision on the "official" way to name it, but it looks like this name will stick. > Regards, > /E > > > On 4/27/2012 9:13 AM, Sergei Petrunia wrote: >> Hi Elena, >> >> I need testing for MWL#182 SHOW EXPLAIN. >> >> The code is here: lp:~maria-captains/maria/5.3-show-explain2 (note the '2' at >> the end) >> >> The branch is currently based on 5.3, although will move to 5.5 soon (I suppose >> this doesn't cause any problems for testing). >> >> Currently, I can think of two things that need testing: >> >> === "Asynchronous Procedure Call" module === >> This is a module that allows one thread to schedule a call in the other thread, >> and wait until the call has been invoked. >> >> Suggested way to test: >> - run a set of queries that look at each other with "SHOW EXPLAIN FOR<thread>" >> statements. >> - have some "victim" threads which run long queries, and have "attacker" >> threads which submit a lot of "SHOW EXPLAIN FOR<victim_thread>" queries. >> >> === On-the-fly EXPLAIN printing functionality === >> Before this WL, the code that produced EXPLAIN output >> - Required that optimizer produces a slightly different structures when EXPLAIN >> is running >> - Did destructive modifications to the query plan (that is, it was not possible >> to call these functions two times to get two EXPLAIN outputs for the same >> planned query) >> >> Suggested way to test: >> - Run various complicated queries, with UNIONs, JOINs, etc. >> - While they are running, do SHOW EXPLAIN FOR command for them, expecting >> it to crash or produce nonsensical output at some point. >> If SHOW EXPLAIN crashes, the crash report will show the query it was trying >> to obtain the EXPLAIN for. >> >> My current suggestion is to use some "runner" threads to run the queries and >> use another set of threads to hit the "runner" threads with SHOW EXPLAIN >> request. >> >> When creating tests in mysql-test/t/show_explain.test, I made a framework that >> allows to stop query execution at some particular point and then wait until >> some number of SHOW EXPLAIN requests were arrived and served. >> >> This requires insertion of "probes" into the source code, though. >> >> Perhaps, we could use something like that for your testing: to have the query >> pause at some "interesting" points and wait for SHOW EXPLAIN requests to arrive >> and be served. I wasn't able to come up with any intelligent way to find >> interesting point though, so this is still just an idea. >> >> BR >> Sergei -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] [Bug 988694] Re: Client software depends on server PAM plugin setup
by sergii＠pisem.net 27 Apr '12

27 Apr '12

Hi, Predrag! On Apr 27, Predrag Zecevic wrote: > @Sergei, > > is that MariaDB PAM plugin portable to MySQL? > > Regards. > > BTW, thanks for clarifications about PAM plugin usage for MySQL. I'm taking this out of percona-pam-plugin bug report, hope it's ok. Personally, I didn't try it with MySQL. But because pluggable authentication in MySQL is pretty much the same as in MariaDB (in fact, we've implemented it, and contributed to Oracle), our pam plugin should work. It might need minor cosmetic changes to compile though. Alternatively, you can simply use MariaDB :) it has everything that MySQL does, plus much faster subqueries, much faster replication, and tons of other goodies. Regards, Sergei

2 1

[Maria-developers] lp:maria -> 5.3 or 5.5?
by Sergei Golubchik 27 Apr '12

27 Apr '12

Hi, Currently lp:maria is the same as lp:maria/5.3 - our main 5.3 branch. Typically for projects on launchpad, the short url points to a trunk. In our case it's an old (not even the latest) GA branch. I suggest to move lp:maria to be lp:maria/5.5 at once. And change to lp:maria/trunk as soon as we'll have it. Objections? Regards, Sergei

2 1

Re: [Maria-developers] bsd9 buildbot host
by Kristian Nielsen 27 Apr '12

27 Apr '12

Daniel Bartholomew <dbart(a)montyprogram.com> writes: > I've installed buildbot on the bsd9 host at Timour's office and set it > up as a buildslave. > However, the builder keeps throwing an exception right at the start of > the compile step. For example build 4: > http://buildbot.askmonty.org/buildbot/builders/bsd9-64/builds/4 > > The err.html file says: "exceptions.KeyError: 'keepstamp'" and the > err.text file says: "Traceback from remote host -- Traceback > unavailable". Looks like this is this bug: http://trac.buildbot.net/ticket/1995 Apparently this happens when Buildbot master tries to download the compiler warning suppression file from the slave. The `keepstamp' argument is mandatory for such download on the version of buildslave installed on that host due to above bug (IIUC). The easiest fix is probably just to disable the download of the suppression file. I think we can live without it. I tried that, and it seems to work - compile is running now. - Kristian.

1 0

[Maria-developers] MariaDB & InnoDB native aio disabled
by jocelyn fournier 25 Apr '12

25 Apr '12

Hi, I've just figured out after installing MariaDB 5.5.23 on two server (one directly from the x64 binary, and the other using the debian packing) that innodb_use_native_aio is OFF on the two servers. Before upgrading to MariaDB, I was using percona 5.5.21-rel25.1-234.squeeze, and innodb_use_native_aio was properly used. There's nothing wrong reported in the MySQL log. The log with percona 5.5.21 : 120425 3:55:46 InnoDB: The InnoDB memory heap is disabled 120425 3:55:46 InnoDB: Mutexes and rw_locks use GCC atomic builtins 120425 3:55:46 InnoDB: Compressed tables use zlib 1.2.3 120425 3:55:46 InnoDB: Using Linux native AIO 120425 3:55:46 InnoDB: Initializing buffer pool, size = 9.0G 120425 3:55:47 InnoDB: Completed initialization of buffer pool 120425 3:55:47 InnoDB: highest supported file format is Barracuda. 120425 3:55:50 InnoDB: Waiting for the background threads to start 120425 3:55:51 Percona XtraDB (http://www.percona.com) 1.1.8-rel25.1 started; log sequence number 33812567651 The log with mariadb 5.5.23 : 120425 3:41:04 InnoDB: The InnoDB memory heap is disabled 120425 3:41:04 InnoDB: Mutexes and rw_locks use GCC atomic builtins 120425 3:41:04 InnoDB: Compressed tables use zlib 1.2.3.4 120425 3:41:04 InnoDB: Initializing buffer pool, size = 9.0G 120425 3:41:04 InnoDB: Completed initialization of buffer pool 120425 3:41:04 InnoDB: highest supported file format is Barracuda. 120425 3:41:08 InnoDB: Waiting for the background threads to start 120425 3:41:09 Percona XtraDB (http://www.percona.com) 1.1.8-24.1 started; log sequence number 33812411088 (no more line saying Linux native AIO is used) Am I missing something ? Thanks and regards, Jocelyn Fournier -- This message was sent from Launchpad by jocelyn fournier (https://launchpad.net/~joce) to each member of the Maria Discuss team using the "Contact this team" link on the Maria Discuss team page (https://launchpad.net/~maria-discuss) For more information see https://help.launchpad.net/YourAccount/ContactingPeople

1 0

Re: [Maria-developers] [Commits] Rev 3365: Dependency of tests from ulong size removed. in file:///home/bell/maria/bzr/work-maria-5.5-MDEV-219-1/
by Sergei Golubchik 19 Apr '12

19 Apr '12

Hi, Sanja! On Apr 19, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.5-MDEV-219-1/ > > ------------------------------------------------------------ > revno: 3365 > revision-id: sanja(a)montyprogram.com-20120419130044-inzqd6nnksyhcpa1 > parent: sergii(a)pisem.net-20120405135727-1kxtscd76rq6xw5o > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.5-MDEV-219-1 > timestamp: Thu 2012-04-19 16:00:44 +0300 > message: > Dependency of tests from ulong size removed. Looks ok to me. But, please, don't push it directly to 5.5, run it in Buildbot on a stage tree first. If that'll show up all green - please push into 5.5. Regards, Sergei

1 0

[Maria-developers] WL#251 New (by Igor): Encapsulate calculations of the table access cost and make them consistent and tunable
by worklog-noreply＠askmonty.org 16 Apr '12

16 Apr '12

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Encapsulate calculations of the table access cost and make them consistent and tunable CREATION DATE..: Mon, 16 Apr 2012, 18:32 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: Igor Knielsen Monty Psergey Sanja Sergei Timour Wlad CATEGORY.......: Server-Sprint TASK ID........: 251 (http://askmonty.org/worklog/?tid=251) VERSION........: Benchmarks-3.0 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: This task is mostly a re-engineering task. Currently when calculating the cost of a ref table access method the function best_access_path makes an assumption that any index look-up is performed into a B-tree and the function uses engine independent code for this calculations. The cost calculations also use some constants that should be done tunable through system variables since these constants may be different for different platform/environments. This task is implemented in preparation for the development that will support more realistic cost model for query execution plans. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] 3365: removed dependency of tests from ulong size
by Sergei Golubchik 12 Apr '12

12 Apr '12

Hi, Sanja! On Apr 12, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.5-MDEV-219-1/ > > ------------------------------------------------------------ > revno: 3365 > revision-id: sanja(a)montyprogram.com-20120412051920-972kyz35kujeljyw > parent: sergii(a)pisem.net-20120405135727-1kxtscd76rq6xw5o > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.5-MDEV-219-1 > timestamp: Thu 2012-04-12 08:19:20 +0300 > message: > removed dependency of tests from ulong size > > === modified file 'sql/sql_cache.cc' > --- a/sql/sql_cache.cc 2012-03-27 23:04:46 +0000 > +++ b/sql/sql_cache.cc 2012-04-12 05:19:20 +0000 > @@ -1348,9 +1348,15 @@ ulong Query_cache::resize(ulong query_ca > > ulong Query_cache::set_min_res_unit(ulong size) > { > - if (size < min_allocation_unit) > - size= min_allocation_unit; > - return (min_result_data_size= ALIGN_SIZE(size)); > + if (size > 0xFFFFFFF8) > + size= 0xFFFFFFF8; /* assign maximum 32bit aligned to avoid overflow */ why wouldn't you change size to be uint or ulonglong? > + else > + { > + if (size < min_allocation_unit) > + size= min_allocation_unit; > + size= ALIGN_SIZE(size); > + } > + return (min_result_data_size= size); > } Regards, Sergei

1 0

[Maria-developers] MariaDB 5.5.23-stable (GA) release
by Daniel Bartholomew 11 Apr '12

11 Apr '12

All, The 5.5.23 release notes and changelog are at: * http://kb.askmonty.org/en/mariadb-5523-release-notes * http://kb.askmonty.org/en/mariadb-5523-changelog Please let me know ASAP of any errors or omissions in the release notes (or jump in and fix them). Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] YaSSL upgrade
by Kristian Nielsen 10 Apr '12

10 Apr '12

Hi Serg, I'd like to discuss this bug with you when convenient (which may be next week, after the Percona Live conference :) https://bugs.launchpad.net/maria/+bug/977571 See my comments on the bug. In 5.3.6, we merged from mysql an upgrade of bundled yassl, and apparently this now conflicts with openssl loaded at the same time. I'd like to discuss with you if something can be done to avoid this conflict - though it might be that this is unavoidable, and the solution is just to link openssl dynamically. - Kristian.

1 0

[Maria-developers] MariaDB 5.3.6 release
by Daniel Bartholomew 08 Apr '12

08 Apr '12

All, I've uploaded the packages for MariaDB 5.3.6 to the primary mirror. I've also created initial Release Notes and Changelog pages for the release. They are located here: * http://kb.askmonty.org/en/mariadb-536-release-notes * http://kb.askmonty.org/en/mariadb-536-changelog Please let me know ASAP about anything which should be mentioned in the release notes, or if there are any changes which need to be made. My plan is to activate the release tomorrow morning (9 Apr) before I leave to travel to the user conference. I have an early flight, so it will be at around 04:00, U.S. Eastern Time. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] [Commits] Rev 3145: MDEV-80 Memory engine table full at much less than max_heap_table_size with btree index. in file:///home/hf/wmar/mdev80/
by Sergei Golubchik 06 Apr '12

06 Apr '12

Hi, Holyfoot! So, does that mean you've managed to reproduce the bug? Or you just found a possible cause for such a behavior and fixed it? On Apr 05, holyfoot(a)askmonty.org wrote: > revno: 3145 > revision-id: holyfoot(a)askmonty.org-20120405082116-w4xqjil2adoq12r3 > parent: sergii(a)pisem.net-20120404134150-6bonhsdqyrxjhku5 > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev80 > timestamp: Thu 2012-04-05 13:21:16 +0500 > message: > MDEV-80 Memory engine table full at much less than max_heap_table_size with btree index. > RB-tree index in the MEMORY table fails if it grews over 4G. > That happened because the old_allocated variable in hp_rb_write_key() > had the uint type. Changed with the 'size_t' type to be same as the > 'rb_tree.allocated'. > > per-file comments: > storage/heap/hp_write.c > MDEV-80 Memory engine table full at much less than max_heap_table_size with btree index. > uint->size_t for the 'old_allocated'. Regards, Sergei

2 3

[Maria-developers] MariaDB 5.1.62 and 5.2.12 releases
by Daniel Bartholomew 06 Apr '12

06 Apr '12

All, I've uploaded the packages for MariaDB 5.1.62 and 5.2.12 to the primary mirror. I've also created initial Release Notes and Changelog pages for the releases. These releases are happening now because they include an important security fix. MariaDB 5.1.62: * http://kb.askmonty.org/en/mariadb-5162-release-notes * http://kb.askmonty.org/en/mariadb-5162-changelog MariaDB 5.2.12: * http://kb.askmonty.org/en/mariadb-5212-release-notes * http://kb.askmonty.org/en/mariadb-5212-changelog Please let me know ASAP about anything which should be mentioned in the release notes. My current plan is to give the mirrors some time to pull from the primary mirror and then activate the releases on Friday morning (6 April, US Eastern time). Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] [Commits] Rev 3488: Fix of LP bug#968720. in file:///home/bell/maria/bzr/work-maria-5.3-lpb968720/
by Igor Babaev 05 Apr '12

05 Apr '12

Sanja, Please correct the comment (see my variant below) and fix the problem in cut() I discovered. Sorry, I basically don't understand your code. Contact me on IRC please. Regards, Igor. On 04/04/2012 04:01 AM, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-lpb968720/ > > ------------------------------------------------------------ > revno: 3488 > revision-id: sanja(a)montyprogram.com-20120404110135-7eca0tt18auum3xo > parent: monty(a)askmonty.org-20120402092715-4cwn2rrcdeafir0x > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.3-lpb968720 > timestamp: Wed 2012-04-04 14:01:35 +0300 > message: > Fix of LP bug#968720. > > Problem: > During converting from merged to materialized all items listed in used_item list changed from real tables to When a view/derived table is converted from merged to materialized the items from the used_item lists are substituted for items referring to the fields of the result of the materialization. The problem appeared with queries employing natural joins. Since the resolution of a natural join was performed only once the used_item list formed at the second execution of the query lacked the references to the fields that were used only in the equality predicates generated for the natural join. the temporary table of materialized join. The problem was that natural join matching made only once and on second prepare phase (first is prepare opf PREPARE statement, second is prepare phase of executing the statement) the list lack fields of natural join because it is not made second time. > > Solution: > Save the used_items list after natural join matching and restore it during re-initialization. > > > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits + /* + Save the lists made during natural join matching (because + the matching done only once but we need the list in case + of prepared statements). + */ ^ remove this comment altogether. + table_ref_1->save_used_items= table_ref_1->used_items; + table_ref_2->save_used_items= table_ref_2->used_items; You save here the head of list only. Why? + ... + /** + Cut the list with leaving not more then n elements ^to leave + */ + inline uint cut(uint n) + { + list_node *element= first; + uint i= 0; + for (; + i < n && element != &end_of_list; + element= element->next); + if (element != &end_of_list) + { + elements= i + 1; + last= &element->next; + element->next= &end_of_list; + } + return i + 1; + } ^^^ i is initialized to 0. i is never changed. in this context the comparison i<n does not make any sense. + /* + Following is a bit hack but pointer length is equal everywhere + and we need revert pointers after prepared statement execution. + */ ^We need to restore the pointers after the execution of the prepared statement + thd->change_item_tree((Item **)&ref->ref, (Item*)materialized_items + idx);

1 0

Re: [Maria-developers] [Commits] Rev 3126: FIX for LP bug#956079 in file:///home/bell/maria/bzr/work-maria-5.2-lpb956079/
by Michael Widenius 03 Apr '12

03 Apr '12

Hi! >>>>> "sanja" == sanja <sanja(a)montyprogram.com> writes: sanja> At file:///home/bell/maria/bzr/work-maria-5.2-lpb956079/ sanja> ------------------------------------------------------------ sanja> revno: 3126 sanja> revision-id: sanja(a)montyprogram.com-20120319122824-7tnmdh8bq7cbnvni sanja> parent: sanja(a)montyprogram.com-20120314100903-a6txqk4l73smh189 sanja> committer: sanja(a)montyprogram.com sanja> branch nick: work-maria-5.2-lpb956079 sanja> timestamp: Mon 2012-03-19 14:28:24 +0200 sanja> message: sanja> FIX for LP bug#956079 sanja> Always set all callbacks for page cache. <cut> > --- a/storage/maria/ma_pagecache.c 2011-08-10 19:44:39 +0000 > +++ b/storage/maria/ma_pagecache.c 2012-03-19 12:28:24 +0000 > @@ -633,7 +633,6 @@ static my_bool pagecache_fwrite(PAGECACH > { > DBUG_ENTER("pagecache_fwrite"); > DBUG_ASSERT(type != PAGECACHE_READ_UNKNOWN_PAGE); > - > #ifdef EXTRA_DEBUG_BITMAP > /* > This code is very good when debugging changes in bitmaps or dirty lists > @@ -654,6 +653,12 @@ static my_bool pagecache_fwrite(PAGECACH > } > #endif > > + DBUG_ASSERT(filedesc->read_callback); > + DBUG_ASSERT(filedesc->write_callback); > + DBUG_ASSERT(filedesc->write_fail); > + DBUG_ASSERT(filedesc->flush_log_callback); Aren't the above callbacks guranteed to be set by the init code? If thats the case, there is no reason to test for these. There is no reason to test for read_callback or write_callback as we will always get a crash if these are not set (a few lines later). As we already test this in ma_pagecache.h, I think we can remove the DBUG_ASSERT's from ma_pagecache.c > === modified file 'storage/maria/ma_pagecache.h' > --- a/storage/maria/ma_pagecache.h 2011-02-28 17:39:30 +0000 > +++ b/storage/maria/ma_pagecache.h 2012-03-19 12:28:24 +0000 > @@ -271,6 +271,10 @@ extern void pagecache_set_write_on_delet > (F).read_callback= (RC); (F).write_callback= (WC); \ > (F).write_fail= (WF); \ > (F).flush_log_callback= (GLC); (F).callback_data= (uchar*)(D); \ > + DBUG_ASSERT((F).read_callback); \ > + DBUG_ASSERT((F).write_callback); \ > + DBUG_ASSERT((F).write_fail); \ > + DBUG_ASSERT((F).flush_log_callback); \ > } while(0) The above is good! It would of course be good to always use the function pagecache_file_init() to set all callbacks instead of setting these directly. To do this, you could change ma_open.c:: _ma_set_data_pagecache_callbacks() to use the above function instead of setting these directly. This way we would know for sure that either none or all are set and we don't need to do any DBUG_ASSERT() of these elements in the code. Regards, Monty

1 0

[Maria-developers] Please test: fix for BUG#913030
by Sergei Petrunia 02 Apr '12

02 Apr '12

Hi Elena, I need a separate test run of semi-join subquery tests on this branch: bzr+ssh://bazaar.launchpad.net/~maria-captains/maria/5.3-bug913030 I need it because the bugfix in this branch changes the order in which join optimizer considers query plans for semi-join subqueries. For synthetic data that RQG works on, this can have an effect that the query plans that were not choosen before will not be used. BUG#913030 is a high-priority 5.3 bug, so this is fairly urgent. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] MariaDB 5.1.61 and 5.2.11 releases
by Daniel Bartholomew 31 Mar '12

31 Mar '12

All, I've uploaded the packages for MariaDB 5.1.61 and 5.2.11 to the primary mirror. I've also created initial Release Notes and Changelog pages for the releases. MariaDB 5.1.61: * http://kb.askmonty.org/en/mariadb-5161-release-notes * http://kb.askmonty.org/en/mariadb-5161-changelog MariaDB 5.2.11: * http://kb.askmonty.org/en/mariadb-5211-release-notes * http://kb.askmonty.org/en/mariadb-5211-changelog Please let me know ASAP about anything which should be mentioned in the release notes. My current plan is to activate the releases on Monday morning (US Eastern time). Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] Analysing MariaDB 5.5 sysbench performance regression
by Kristian Nielsen 31 Mar '12

31 Mar '12

I have been analysing the performance difference between MariaDB 5.5.21 and MySQL 5.5.21 using oltp.lua in sysbench 0.5. It turns out that MySQL has about 8% higher tps in this benchmark when running CPU bound. (See below for links to blog posts that started this). I took the base sysbench run and tweaked it to get stable numbers - basically put the datadir in ramdisk and adjusted my.cnf a bit (more details below). Then I used OProfile to analyse where the difference comes from. Oprofile is a really great tool for this kind of analysis, where CPU time spent is the measurement. It is very easy to use, and it gives detailed and accurate measurements on how much time is spent in each function. It is then easy to compare this against MySQL and find where we have performance regressions. Then further details is available by adding call graph to the reports, which shows from where the expensive parts are called; and by using the annotation facility which annotates every function and puts execution times on the individual statement and assembler functions. Here is an overview of where the extra time is spent. Time is in units of samples, which is 1/100000 of a clock cycle. Total was around 4.15M samples. Here are the top functions I found used more time in MariaDB, and the amount of extra samples spent in MariaDB: 39k mysql_select 20k alloc_root 16k JOIN::choose_subquery_plan 10k thd_ha_data 10k make_sortkey() 9k get_best_combination 9k handler::read_range_next 7k handler::ha_thd 7k update_ref_and_keys 7k Item::cmp_type 6k Item::operator delete 5k ha_maria::implicit_commit 4k end_write 4k sort_and_filter_keyuse 4k my_interval_timer 4k st_select_lex::master_unit 4k st_select_lex::save_leaf_tables 4k sel_arg_range_seq_next 4k thd_test_options 4k Item_func::walk 4k TABLE::init 4k sub_select 3k strnmov 3k ut_free 3k vio_write 3k ut_malloc_low 2k setup_tables 2k create_ref_for_key Some care is needed to interpret these data. GCC -O3 does heavy inlining. Oprofile is a statistical profiler, so numbers are somewhat uncertain, more so for smaller numbers. And modern CPUs are superscalar, out-of-order, and hyper-threaded, which makes interpreting individual instruction costs higly challenging. But the list can be used to drill down into the actual code; opannotate --source --assembler is very enlightening, in my experience (few examples below). >From this list, it seems that - not surprising - the 5.3 optimiser features seem to have added a bit of overhead. Much of this is spread out over many places in the code, though it could be that the root cause comes from few inlined functions. I checked mysql_select(), and most of the overhead is from lp:941889, expensive constructors in JOIN, which was inlined by GCC. I believe Sergey plans to fix this. More analysis of the individual functions is needed to find the cause there. It seems we are also using alloc_root() somewhat more. thd_ha_data and maybe handler_thd are likely due to using dynamically loaded innodb_plugin rather than built-in. I would like to do more analysis (and would probably need help from optimiser-knowledgable people for most of it) - I think it is feasible to remove most of the overhead in a modest time frame. But my main point is to present these results, to show that we have a very useful tool to pin-point these performance issues, and to start discussion in more detail (and I have plenty more of those). ----------------------------------------------------------------------- More background: These benchmarks started from these blog posts: http://www.mysqlperformanceblog.com/2012/02/18/mariadb-5-3-4-benchmarks/ http://blog.montyprogram.com/benchmarking-mariadb-5-3-4/ The main difference in these tests seem to be caused by different XtraDB buffer pool flush algorithm. So Axel tried using innodb_pluing in MariaDB instead, and got much smaller differences - but a difference was still there. So for 5.5 I took Axel's benchmark, adjusted until I got stable, fully cpu-bound numbers, and analysed the results, as above. I have the actual scripts and my.cnf available if anyone is interested. Main point is datadir in ramdisk, reducing redo log size to 300MB total, and running for 30 seconds. As examples, I analysed a handful of cases, and came up with two simple patches for specific issues. One is update_virtual_fields(), which originally accounted for 0.5% of total time in sysbench. This seems to be called for every row, so just the push/pop of registers in function prologue became significant. I fixed this with below patch; it puts a NULL pointer into the table instead of an empty list of virtual fields, and guards a few frequent calls with an if (NULL) check. Another is my_hash_sort_simple(). This is not a regression, but Oprofile shows we spend 10% of total time in this function. opannotate of the assembler showed the problem. Below simple patch speeds it up by 33%, by reducing 4 memory loads per loop to 2. Still, it would be nice to understand why this is called that much - here is the call stack: my_hash_sort_simple() ha_heap::write_row(). evaluate_join_record() sub_select() do_select() JOIN::exec() mysql_select() It would be nice to understand why this is needed - this is an expensive function, it needs to lookup every character in the collation tables. If this could be eliminated, that alone would probably be enough to win over MySQL, even without fixing any of the regressions. Some other top contenders in the profile are innodb functions. For example buf_calc_page_new_checksum(). This is expensive, as it needs to loop over every byte in each buffer pool page (16K), computing a 7-long dependency chain for each byte. This could be much faster if the checksum was done on 8-byte longwords, but AFAIK, it's not trivial to change the checksum algorithm due to the migration issues. Facebook may have done some work on this. Another top contender is row_sel_store_mysql_rec() and similar - they show high costs in the opannotate on loads from the records, this is probably cache misses from accessing pages in the buffer pool - not too much to do about that I think. Hope this helps, - Kristian. ----------------------------------------------------------------------- Patch for my_hash_sort_simple(): === modified file 'strings/ctype-simple.c' --- strings/ctype-simple.c 2012-01-13 14:50:02 +0000 +++ strings/ctype-simple.c 2012-03-16 16:34:31 +0000 @@ -306,19 +306,24 @@ void my_hash_sort_simple(CHARSET_INFO *c { register const uchar *sort_order=cs->sort_order; const uchar *end; + ulong n1, n2; /* Remove end space. We have to do this to be able to compare 'A ' and 'A' as identical */ end= skip_trailing_space(key, len); - + + n1= *nr1; + n2= *nr2; for (; key < (uchar*) end ; key++) { - nr1[0]^=(ulong) ((((uint) nr1[0] & 63)+nr2[0]) * - ((uint) sort_order[(uint) *key])) + (nr1[0] << 8); - nr2[0]+=3; + n1^=(ulong) ((((uint) n1 & 63)+n2) * + ((uint) sort_order[(uint) *key])) + (n1 << 8); + n2+=3; } + *nr1= n1; + *nr2= n2; } ----------------------------------------------------------------------- Patch for update_virtual_fields(): === modified file 'sql/filesort.cc' --- sql/filesort.cc 2012-03-11 22:45:18 +0000 +++ sql/filesort.cc 2012-03-16 19:17:58 +0000 @@ -589,7 +589,7 @@ static ha_rows find_all_keys(SORTPARAM * { if ((error= select->quick->get_next())) break; - if (!error) + if (!error && sort_form->vfield) update_virtual_fields(thd, sort_form); file->position(sort_form->record[0]); DBUG_EXECUTE_IF("debug_filesort", dbug_print_record(sort_form, TRUE);); @@ -608,7 +608,7 @@ static ha_rows find_all_keys(SORTPARAM * else { error=file->ha_rnd_next(sort_form->record[0]); - if (!error) + if (!error && sort_form->vfield) update_virtual_fields(thd, sort_form); if (!flag) { === modified file 'sql/records.cc' --- sql/records.cc 2012-01-13 14:50:02 +0000 +++ sql/records.cc 2012-03-16 19:15:51 +0000 @@ -344,7 +344,8 @@ static int rr_quick(READ_RECORD *info) break; } } - update_virtual_fields(info->thd, info->table); + if (info->table->vfield) + update_virtual_fields(info->thd, info->table); return tmp; } === modified file 'sql/sql_select.cc' --- sql/sql_select.cc 2012-03-11 22:45:18 +0000 +++ sql/sql_select.cc 2012-03-16 19:15:05 +0000 @@ -15824,7 +15824,8 @@ evaluate_join_record(JOIN *join, JOIN_TA DBUG_RETURN(NESTED_LOOP_KILLED); /* purecov: inspected */ } - update_virtual_fields(join->thd, join_tab->table); + if (join_tab->table->vfield) + update_virtual_fields(join->thd, join_tab->table); if (select_cond) { === modified file 'sql/table.cc' --- sql/table.cc 2012-03-02 23:03:20 +0000 +++ sql/table.cc 2012-03-18 16:10:18 +0000 @@ -2466,30 +2466,35 @@ int open_table_from_share(THD *thd, TABL /* Process virtual columns, if any. */ - if (!(vfield_ptr = (Field **) alloc_root(&outparam->mem_root, - (uint) ((share->vfields+1)* - sizeof(Field*))))) - goto err; - - outparam->vfield= vfield_ptr; - - for (field_ptr= outparam->field; *field_ptr; field_ptr++) + if (!share->vfields) + outparam->vfield= NULL; + else { - if ((*field_ptr)->vcol_info) + if (!(vfield_ptr = (Field **) alloc_root(&outparam->mem_root, + (uint) ((share->vfields+1)* + sizeof(Field*))))) + goto err; + + outparam->vfield= vfield_ptr; + + for (field_ptr= outparam->field; *field_ptr; field_ptr++) { - if (unpack_vcol_info_from_frm(thd, - outparam, - *field_ptr, - &(*field_ptr)->vcol_info->expr_str, - &error_reported)) + if ((*field_ptr)->vcol_info) { - error= 4; // in case no error is reported - goto err; + if (unpack_vcol_info_from_frm(thd, + outparam, + *field_ptr, + &(*field_ptr)->vcol_info->expr_str, + &error_reported)) + { + error= 4; // in case no error is reported + goto err; + } + *(vfield_ptr++)= *field_ptr; } - *(vfield_ptr++)= *field_ptr; } + *vfield_ptr= 0; // End marker } - *vfield_ptr= 0; // End marker #ifdef WITH_PARTITION_STORAGE_ENGINE if (share->partition_info_str_len && outparam->file) -----------------------------------------------------------------------

4 5

[Maria-developers] MariaDB 5.5.22-rc release
by Daniel Bartholomew 29 Mar '12

29 Mar '12

All, The MariaDB 5.5.22-rc release has been uploaded to the primary mirror and will be replicated to the other mirrors over the next few hours. The release notes and changelog pages for this release are at: https://kb.askmonty.org/en/mariadb-5522-release-notes https://kb.askmonty.org/en/mariadb-5522-changelog As soon as the release files are mirrored I will activate the downloads page, update various banners and links, and then I or Colin will send out an announce email and promote the release in the usual manner. In the mean time, please let me know if there is anything which should be mentioned in the release notes that currently is not. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] WL#250 New (by Igor): Use the statistics from persistent statistical tables instead of the statistics provided by engine
by worklog-noreply＠askmonty.org 25 Mar '12

25 Mar '12

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Use the statistics from persistent statistical tables instead of the statistics provided by engine CREATION DATE..: Sun, 25 Mar 2012, 17:36 SUPERVISOR.....: IMPLEMENTOR....: Igor COPIES TO......: Igor Monty Psergey Sergei Timour CATEGORY.......: Server-Sprint TASK ID........: 250 (http://askmonty.org/worklog/?tid=250) VERSION........: Server-5.6 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: This task adds the functionality that allows optionally to use use the statistics from persistent statistical tables (see MWL #248) instead the statistics provided by engine. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] [Commits] Improve filesort performance for small sorts
by Sergei Golubchik 24 Mar '12

24 Mar '12

Hi, Kristian! FYI: http://bazaar.launchpad.net/~mysql/mysql-server/trunk/revision/tor.didrikse… On Mar 24, knielsen(a)knielsen-hq.org wrote: > ------------------------------------------------------------ > revno: 3471 > revision-id: knielsen(a)knielsen-hq.org-20120324160859-6pzy6tcxvd6j4fbx > parent: monty(a)askmonty.org-20120323162239-h18wbqpbjz0p00jd > committer: knielsen(a)knielsen-hq.org > branch nick: mariadb-5.3 > timestamp: Sat 2012-03-24 17:08:59 +0100 > message: > Improve filesort performance for small sorts: Don't write pointers to records that we will never use. Regards, Sergei

1 0

[Maria-developers] Igor please review: [Commits] Rev 3464: BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view in file:///home/psergey/dev2/5.3-look60/]
by Sergei Petrunia 24 Mar '12

24 Mar '12

Hello Igor, Could you please review the below: ----- Forwarded message from Sergey Petrunya <psergey(a)askmonty.org> ----- From: Sergey Petrunya <psergey(a)askmonty.org> To: commits(a)mariadb.org X-Mailer: mail (GNU Mailutils 1.2) Date: Sat, 24 Mar 2012 01:40:02 +0400 (GST) Subject: [Commits] Rev 3464: BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view in file:///home/psergey/dev2/5.3-look60/ At file:///home/psergey/dev2/5.3-look60/ ------------------------------------------------------------ revno: 3464 revision-id: psergey(a)askmonty.org-20120323213956-ohxb9jitekne7yya parent: psergey(a)askmonty.org-20120321071820-t2azo8xxlm73mezd committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: 5.3-look60 timestamp: Sat 2012-03-24 01:39:56 +0400 message: BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view - Fix equality propagation to work with SJM nests and OR clauses (full descirption of problem and solution in the comment in the patch) === modified file 'mysql-test/r/subselect_sj2.result' --- a/mysql-test/r/subselect_sj2.result 2012-02-25 00:50:22 +0000 +++ b/mysql-test/r/subselect_sj2.result 2012-03-23 21:39:56 +0000 @@ -903,5 +903,48 @@ 3 1 1 4 1 1 DROP TABLE t1,t2; +# +# BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view +# +CREATE TABLE t1 ( +a VARCHAR(1), +b VARCHAR(1) NOT NULL, +KEY(a) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('j','j'),('v','v'),('c','c'),('m','m'),('d','d'), +('y','y'),('t','t'),('d','d'),('s','s'),('r','r'), +('m','m'),('b','b'),('x','x'),('g','g'),('p','p'), +('q','q'),('w','w'),('d','d'),('e','e'); +CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1; +SELECT * FROM v1 +WHERE ( a, a ) IN ( +SELECT alias2.b, alias2.a +FROM t1 AS alias1, t1 AS alias2 +WHERE alias2.b = alias1.a +AND ( alias1.b >= alias1.a OR alias2.b = 'z' ) +); +a b +j j +v v +c c +m m +m m +d d +d d +d d +y y +t t +s s +r r +b b +x x +g g +p p +q q +w w +e e +DROP VIEW v1; +DROP TABLE t1; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; === modified file 'mysql-test/r/subselect_sj2_jcl6.result' --- a/mysql-test/r/subselect_sj2_jcl6.result 2012-02-25 00:50:22 +0000 +++ b/mysql-test/r/subselect_sj2_jcl6.result 2012-03-23 21:39:56 +0000 @@ -917,6 +917,49 @@ 3 1 1 4 1 1 DROP TABLE t1,t2; +# +# BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view +# +CREATE TABLE t1 ( +a VARCHAR(1), +b VARCHAR(1) NOT NULL, +KEY(a) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('j','j'),('v','v'),('c','c'),('m','m'),('d','d'), +('y','y'),('t','t'),('d','d'),('s','s'),('r','r'), +('m','m'),('b','b'),('x','x'),('g','g'),('p','p'), +('q','q'),('w','w'),('d','d'),('e','e'); +CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1; +SELECT * FROM v1 +WHERE ( a, a ) IN ( +SELECT alias2.b, alias2.a +FROM t1 AS alias1, t1 AS alias2 +WHERE alias2.b = alias1.a +AND ( alias1.b >= alias1.a OR alias2.b = 'z' ) +); +a b +j j +v v +c c +m m +m m +d d +d d +d d +y y +t t +s s +r r +b b +x x +g g +p p +q q +w w +e e +DROP VIEW v1; +DROP TABLE t1; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; # === modified file 'mysql-test/r/subselect_sj2_mat.result' --- a/mysql-test/r/subselect_sj2_mat.result 2012-02-25 00:50:22 +0000 +++ b/mysql-test/r/subselect_sj2_mat.result 2012-03-23 21:39:56 +0000 @@ -905,6 +905,49 @@ 3 1 1 4 1 1 DROP TABLE t1,t2; +# +# BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view +# +CREATE TABLE t1 ( +a VARCHAR(1), +b VARCHAR(1) NOT NULL, +KEY(a) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('j','j'),('v','v'),('c','c'),('m','m'),('d','d'), +('y','y'),('t','t'),('d','d'),('s','s'),('r','r'), +('m','m'),('b','b'),('x','x'),('g','g'),('p','p'), +('q','q'),('w','w'),('d','d'),('e','e'); +CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1; +SELECT * FROM v1 +WHERE ( a, a ) IN ( +SELECT alias2.b, alias2.a +FROM t1 AS alias1, t1 AS alias2 +WHERE alias2.b = alias1.a +AND ( alias1.b >= alias1.a OR alias2.b = 'z' ) +); +a b +j j +v v +c c +m m +m m +d d +d d +d d +y y +t t +s s +r r +b b +x x +g g +p p +q q +w w +e e +DROP VIEW v1; +DROP TABLE t1; # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; set optimizer_switch=default; === modified file 'mysql-test/t/subselect_sj2.test' --- a/mysql-test/t/subselect_sj2.test 2012-01-19 19:44:43 +0000 +++ b/mysql-test/t/subselect_sj2.test 2012-03-23 21:39:56 +0000 @@ -1090,5 +1090,32 @@ DROP TABLE t1,t2; +--echo # +--echo # BUG#951937: Wrong result (missing rows) with semijoin+materialization, IN subquery, InnoDB, TEMPTABLE view +--echo # +CREATE TABLE t1 ( + a VARCHAR(1), + b VARCHAR(1) NOT NULL, + KEY(a) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES +('j','j'),('v','v'),('c','c'),('m','m'),('d','d'), +('y','y'),('t','t'),('d','d'),('s','s'),('r','r'), +('m','m'),('b','b'),('x','x'),('g','g'),('p','p'), +('q','q'),('w','w'),('d','d'),('e','e'); + +CREATE ALGORITHM=TEMPTABLE VIEW v1 AS SELECT * FROM t1; + +# This query returns 6 rows instead of 19 + +SELECT * FROM v1 +WHERE ( a, a ) IN ( + SELECT alias2.b, alias2.a + FROM t1 AS alias1, t1 AS alias2 + WHERE alias2.b = alias1.a + AND ( alias1.b >= alias1.a OR alias2.b = 'z' ) +); +DROP VIEW v1; +DROP TABLE t1; --echo # This must be the last in the file: set optimizer_switch=@subselect_sj2_tmp; === modified file 'sql/item_cmpfunc.cc' --- a/sql/item_cmpfunc.cc 2012-02-28 14:41:55 +0000 +++ b/sql/item_cmpfunc.cc 2012-03-23 21:39:56 +0000 @@ -5388,7 +5388,7 @@ */ Item_equal::Item_equal(Item *f1, Item *f2, bool with_const_item) - : Item_bool_func(), eval_item(0), cond_false(0) + : Item_bool_func(), eval_item(0), cond_false(0), context_field(NULL) { const_item_cache= 0; with_const= with_const_item; @@ -5411,7 +5411,7 @@ */ Item_equal::Item_equal(Item_equal *item_equal) - : Item_bool_func(), eval_item(0), cond_false(0) + : Item_bool_func(), eval_item(0), cond_false(0), context_field(NULL) { const_item_cache= 0; List_iterator_fast<Item> li(item_equal->equal_items); === modified file 'sql/item_cmpfunc.h' --- a/sql/item_cmpfunc.h 2012-01-19 22:11:53 +0000 +++ b/sql/item_cmpfunc.h 2012-03-23 21:39:56 +0000 @@ -1700,9 +1700,16 @@ as datetimes. The comparator is used only if compare_as_dates=TRUE */ Arg_comparator cmp; + + /* + For Item_equal objects inside an OR clause: one of the fields that were + used in the original comparison. + */ + Item_field *context_field; public: inline Item_equal() - : Item_bool_func(), with_const(FALSE), eval_item(0), cond_false(0) + : Item_bool_func(), with_const(FALSE), eval_item(0), cond_false(0), + context_field(NULL) { const_item_cache=0 ;} Item_equal(Item *f1, Item *f2, bool with_const_item); Item_equal(Item_equal *item_equal); @@ -1729,6 +1736,8 @@ Item *transform(Item_transformer transformer, uchar *arg); virtual void print(String *str, enum_query_type query_type); CHARSET_INFO *compare_collation(); + + void set_context_field(Item_field *ctx_field) { context_field= ctx_field; } friend class Item_equal_fields_iterator; friend Item *eliminate_item_equal(COND *cond, COND_EQUAL *upper_levels, Item_equal *item_equal); === modified file 'sql/opt_subselect.cc' --- a/sql/opt_subselect.cc 2012-03-18 19:58:20 +0000 +++ b/sql/opt_subselect.cc 2012-03-23 21:39:56 +0000 @@ -171,6 +171,246 @@ */ +/* +EqualityPropagationAndSjmNests +****************************** + +The process of equality propagation has two parts +P1. Equality propagation +P2. Equality substitution [for a certain join order] + +The propagation part is not affected by SJM nests. In fact, it is done before +we determine the execution plan, i.e. before we even know we will use +SJM-nests for execution. + +The substitution part is affected. + +Substitution without SJMs +========================= +When one doesn't have SJM nests, tables have a strict join order: + + ---------------------------------> + t1 -- t2 -- t3 -- t4 --- t5 + + + ? ^ + \ + --(part-of-WHERE) + + +parts WHERE/ON and ref. expressions are attached at some point along the axis. +Expression is allowed to refer to a table column if the table is to the left of +the attachment point. For any given expression, we have a goal: + + "Move leftmost allowed attachment point as much as possible to the left" + +Substitution with SJMs - task setting +===================================== + +When SJM nests are present, there is no global strict table ordering anymore: + + + ---------------------------------> + + ot1 -- ot2 --- sjm -- ot4 --- ot5 + | + | Main execution + - - - - - - - - - - - - - - - - - - - - - - - - + | Materialization + it1 -- it2 --/ + + +Besides that, we must take into account that + - values for outer table columns, otN.col, are inaccessible at + materialization step (SJM-RULE) + - values for inner table columns, itN.col, are inaccessible at Main execution + step, except for SJ-Materialization-Scan and columns that are in the + subquery's select list. (SJM-RULE) + +Substitution with SJMs - solution +================================= + +First, we introduce global strict table ordering like this: + + ot1 - ot2 --\ /--- ot3 -- ot5 + \--- it1 --- it2 --/ + +Now, let's see how to meet (SJM-RULE). + +SJ-Materialization is only applicable for uncorrelated subqueries. From this, it +follows that any multiple equality will either +1. include only columns of outer tables, or +2. include only columns of inner tables, or +3. include columns of inner and outer tables, joined together through one + of IN-equalities. + +Cases #1 and #2 can be handled in the same way as with regular inner joins. + +Case #3 requires special handling, so that we don't construct violations of +(SJM-RULE). Let's consider possible ways to build violations. + +Equality propagation starts with the clause in this form + + top_query_where AND subquery_where AND in_equalities + +First, it builds multi-equalities. It can also build a mixed multi-equality + + multiple-equal(ot1.col, ot2.col, ... it1.col, itN.col) + +Multi-equalities are pushed down the OR-clauses in top_query_where and in +subquery_where, so it's possible that clauses like this one are built: + + subquery_cond OR (multiple-equal(it1.col, ot1.col,...) AND ...) + ^^^^^^^^^^^^^ \ + | this must be evaluated + \- can only be invaluated on the main phase. + on materialization phase + +Finally, equality substitution is started. It does two operations: + + +1. Field reference substitution +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +(In the code, this is Item_field::replace_equal_field) + +This is a process of replacing each reference to "tblX.col" +with the first element of the multi-equality. (REF-SUBST-ORIG) + +This behaviour can cause problems with Semi-join nests. Suppose, we have a +condition: + + func(it1.col, it2.col) + +and a multi-equality(ot1.col, it1.col). Then, reference to "it1.col" will be +replaced with "ot1.col", constructing a condition + + func(ot1.col, it2.col) + +which will be a vioation of (SJM-RULE). + +In order to avoid this, (REF-SUBST-ORIG) is amended as follows: + +- references to tables "itX.col" that are inner wrt some SJM nest, are + replaced with references to the first inner table from the same SJM nest. + +- references to top-level tables "otX.col" are replaced with references to + the first element of the multi-equality, no matter if that first element is + a column of a top-level table or of table from some SJM nest. + (REF-SUBST-SJM) + + The case where the first element is a table from an SJM nest $SJM is ok, + because it can be proven that $SJM uses SJ-Materialization-Scan, and + "unpacks" correct column values to the first element during the main + execution phase. + +2. Item_equal elimination +~~~~~~~~~~~~~~~~~~~~~~~~~ +(In the code: eliminate_item_equal) This is a process of taking + + multiple-equal(a,b,c,d,e) + +and replacing it with an equivalent expression which is an AND of pair-wise +equalities: + + a=b AND a=c AND ... + +The equalities are picked such that for any given join prefix (t1,t2...) the +subset of equalities that can be evaluated gives the most restrictive +filtering. + +Without SJM nests, it is sufficient to compare every multi-equality member +with the first one: + + elem1=elem2 AND elem1=elem3 AND elem1=elem4 ... + +When SJM nests are present, we should take care not to construct equalities +that violate the (SJM-RULE). This is achieved by generating separate sets of +equalites for top-level tables and for inner tables. That is, for the join +order + + ot1 - ot2 --\ /--- ot3 -- ot5 + \--- it1 --- it2 --/ + +we will generate + ot1.col=ot2.col + ot1.col=ot3.col + ot1.col=ot5.col + it2.col=it1.col + + +2.1 The problem with Item_equals and ORs +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +As has been mentioned above, multiple equalities are pushed down into OR +clauses, possibly building clauses like this: + + func(it.col2) OR multiple-equal(it1.col1, it1.col2, ot1.col) (1) + +where the first part of the clause has references to inner tables, while the +second has references to the top-level tables, which is a violation of +(SJM-RULE). + +AND-clauses of this kind do not create problems, because make_cond_for_table() +will take them apart. OR-clauses will not be split. It is possible to +split-out the part that's dependent on the inner table: + + func(it.col2) OR it1.col1=it1.col2 + +but this is a less-restrictive condition than condition (1). Current execution +scheme will still try to generate the "remainder" condition: + + func(it.col2) OR it1.col1=ot1.col + +which is a violation of (SJM-RULE). + +QQ: "ot1.col=it1.col" is checked at the upper level. Why was it not removed +here? +AA: because has a proper subset of conditions that are found on this level. + consider a join order of ot, sjm(it) + and a condition + ot.col=it.col AND ( ot.col=it.col='foo' OR it.col2='bar') + + we will produce: + table ot: nothing + table it: ot.col=it.col AND (ot.col='foo' OR it.col2='bar') + ^^^^ ^^^^^^^^^^^^^^^^ + | \ the problem is that + | this part condition didnt + | receive a substitution + | + +--- it was correct to subst, 'ot' is + the left-most. + + +Is there any merit in pushing inner=outer down into ORs? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Yes, there is. Consider the query: + + select * from ot + where ot.col in (select it.col from it where (it.col='foo' OR it.col='bar')) + +here, it may be useful to infer that + + (ot.col='foo' OR ot.col='bar') (CASE-FOR-SUBST) + +and attach that condition to the table 'ot'. + +Solution #1 +~~~~~~~~~~~ +Let make_cond_for_table() chop off the bad parts of produced OR clause. If it +has produced an OR clause: +- check if all of its branches are evaluable for the context join_tab +- If some aren't, destroy the OR clause + +Solution #2 +~~~~~~~~~~~ +Before the equality propagation phase, none of the OR clauses violate the +(SJM-RULE). This way, if we remember which tables the original equality +referred to, we can only generate equalities that refer to outer or inner +tables. Note that this will disallow handling of cases like (CASE-FOR-SUBST). +*/ + static bool subquery_types_allow_materialization(Item_in_subselect *in_subs); === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2012-03-13 20:49:18 +0000 +++ b/sql/sql_select.cc 2012-03-23 21:39:56 +0000 @@ -10666,6 +10666,9 @@ acceptable, as this happens rarely. The implementation without copying would be much more complicated. + For description of how equality propagation works with SJM nests, grep + for EqualityPropagationAndSjmNests. + @param left_item left term of the quality to be checked @param right_item right term of the equality to be checked @param item equality item if the equality originates from a condition @@ -10739,12 +10742,14 @@ { /* left_item_equal of an upper level contains left_item */ left_item_equal= new Item_equal(left_item_equal); + left_item_equal->set_context_field(((Item_field*) left_item)); cond_equal->current_level.push_back(left_item_equal); } if (right_copyfl) { /* right_item_equal of an upper level contains right_item */ right_item_equal= new Item_equal(right_item_equal); + right_item_equal->set_context_field(((Item_field*) right_item)); cond_equal->current_level.push_back(right_item_equal); } @@ -10830,6 +10835,7 @@ { item_equal= new Item_equal(item_equal); cond_equal->current_level.push_back(item_equal); + item_equal->set_context_field(field_item); } if (item_equal) { @@ -11480,6 +11486,8 @@ Item_equal::get_first() also takes similar measures for dealing with equality substitution in presense of SJM nests. + Grep for EqualityPropagationAndSjmNests for a more verbose description. + @return - The condition with generated simple equalities or a pointer to the simple generated equality, if success. @@ -11543,9 +11551,13 @@ on upper AND-levels. */ if (upper) - { + { + TABLE_LIST *native_sjm= embedding_sjm(item_equal->context_field); if (item_const && upper->get_const()) + { + /* Upper item also has "field_item=const". Don't produce equality here */ item= 0; + } else { Item_equal_fields_iterator li(*item_equal); @@ -11556,6 +11568,8 @@ break; } } + if (embedding_sjm(field_item) != native_sjm) + item= NULL; /* Don't produce equality */ } bool produce_equality= test(item == field_item); _______________________________________________ commits mailing list commits(a)mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits ----- End forwarded message ----- -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

[Maria-developers] Autolinks to JIRA from the KB
by Daniel Bartholomew 21 Mar '12

21 Mar '12

All, I've created some autolinks for referring to JIRA tasks in the AskMonty Knowledgebase. I've documented how to use them on the "JIRA - project planning and tracking" page, but I wanted to make everyone here aware of them. http://kb.askmonty.org/en/jira-project-planning-and-tracking Basically, when you use mdev-xxx or todo-xxx (where xxx is the mdev or todo number) in a Knowledgebase article, the text will automatically be turned into a link to the task in JIRA. No need to copy the full url and paste it into the KB. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] Need to lock temporary tables?
by webmonkeys＠alibi.com 20 Mar '12

20 Mar '12

>Description: InnoDB: Error: row_search_for_mysql() is called without ha_innobase::external_lock() >How-To-Repeat: create table foo ( data int ); create temporary table tmp_foo (select * from foo limit 0); insert into tmp_foo (data) values (1); lock tables foo write; # add ", tmp_foo read" to the above, to avoid the error. #"LOCK TABLES is permitted (but ignored) for a TEMPORARY table." # -- http://dev.mysql.com/doc/refman/5.0/en/lock-tables.html delete from foo; # The next statement causes # InnoDB: Error: row_search_for_mysql() is called without ha_innobase::external_lock() insert into foo (select * from tmp_foo); unlock tables; drop table tmp_foo; drop table foo; >Fix: Lock the temporary table, though mysql docs say you shouldn't have to. >Submitter-Id: <submitter ID> >Originator: >Organization: >MySQL support: [none | licence | email support | extended email support ] >Synopsis: temporary table wants a lock >Severity: non-critical >Priority: low >Category: mysql >Class: >Release: mysql-5.3.5-MariaDB-ga-mariadb113~squeeze ((MariaDB - http://mariadb.com/)) >C compiler: gcc-4.4.real (Debian 4.4.5-8) 4.4.5 >C++ compiler: g++-4.4.real (Debian 4.4.5-8) 4.4.5 >Environment: System: Linux machibashiri 2.6.32-5-amd64 #1 SMP Mon Mar 7 21:35:22 UTC 2011 x86_64 GNU/Linux Some paths: /usr/bin/perl /usr/bin/make /usr/bin/gcc /usr/bin/cc GCC: Using built-in specs. Target: x86_64-linux-gnu Configured with: ../src/configure -v --with-pkgversion='Debian 4.4.5-8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.4 --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --libdir=/usr/lib --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu Thread model: posix gcc version 4.4.5 (Debian 4.4.5-8) Compilation info (call): CC='gcc -static-libgcc' CFLAGS='-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized' CXX='g++ -static-libgcc' CXXFLAGS='-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized' LDFLAGS='' ASFLAGS='' Compilation info (used): CC='gcc -static-libgcc' CFLAGS=' -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized -DUNIV_LINUX -DUNIV_LINUX' CXX='g++ -static-libgcc' CXXFLAGS=' -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized -fno-implicit-templates -fno-exceptions -fno-rtti' LDFLAGS=' -rdynamic ' ASFLAGS='' LIBC: lrwxrwxrwx 1 root root 14 Apr 13 2011 /lib/libc.so.6 -> libc-2.11.2.so -rwxr-xr-x 1 root root 1432968 Jan 23 2011 /lib/libc-2.11.2.so -rw-r--r-- 1 root root 4433334 Jan 23 2011 /usr/lib/libc.a -rw-r--r-- 1 root root 247 Jan 23 2011 /usr/lib/libc.so Configure command: ../configure '--build=x86_64-linux-gnu' '--host=x86_64-linux-gnu' '--prefix=/usr' '--exec-prefix=/usr' '--libexecdir=/usr/sbin' '--datadir=/usr/share' '--localstatedir=/var/lib/mysql' '--includedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-server-suffix=-mariadb113~squeeze' '--with-comment=(MariaDB - http://mariadb.com/)' '--with-system-type=debian-linux-gnu' '--enable-shared' '--enable-static' '--enable-thread-safe-client' '--enable-assembler' '--enable-local-infile' '--with-pstack' '--with-fast-mutexes' '--with-unix-socket-path=/var/run/mysqld/mysqld.sock' '--with-mysqld-user=mysql' '--with-big-tables' '--without-docs' '--with-extra-charsets=all' '--with-libwrap' '--with-ssl=/usr' '--with-libevent' '--without-readline' '--with-zlib-dir=' '--with-embedded-server' '--with-embedded-privilege-control' '--with-plugins=max-no-ndb' 'build_alias=x86_64-linux-gnu' 'host_alias=x86_64-linux-gnu' 'CC=gcc -static-libgcc' 'CFLAGS=-O2! -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized' 'LDFLAGS=' 'CPPFLAGS=' 'CXX=g++ -static-libgcc' 'CXXFLAGS=-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized'

1 0

[Maria-developers] New KB Question: mariadb compilation flags
by Daniel Bartholomew 19 Mar '12

19 Mar '12

A new question has been posted to the Knowledgebase: http://kb.askmonty.org/en/mariadb-compilation-flags ---------------------------------------------------------------------- how come mariadb is compiled on linux 64 bit with -O2 rather than -O3? mysql is compiled with -O3. does it make any difference? thanks! ---------------------------------------------------------------------- Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

2 1

[Maria-developers] MariaDB 5.5.21
by Daniel Bartholomew 15 Mar '12

15 Mar '12

All, I've uploaded the MariaDB 5.5.21-beta packages to the primary mirror and within a few hours the files will be distributed to all of the mirrors. Over the past couple of weeks I've added several items to the release notes page for 5.5.21 and today I created the changelog page. The pages are here: http://kb.askmonty.org/en/mariadb-5521-release-notes http://kb.askmonty.org/en/mariadb-5521-changelog Once the files are distributed I will update the pages and add in the download links and remove the "unreleased" banners from the pages linked to from the release notes page. I will also send out an announcement email, and post announcements to twitter, FB, G+, and so on as usual. Please let me know ASAP if there is anything which is not on the release notes page which should be (or jump in and add it). Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

4 4

Re: [Maria-developers] mariadb 5.3.5 build on OpenBSD 5.0
by Sergei 15 Mar '12

15 Mar '12

Hi! On Mar 14, U Orsini wrote: > I know this isn't a good way of submitting reports, but I really don't > want to join mailing lists and teams just for this. Hope you can still > use this information. Some of it likely affects other *BSDs too. A good way of submitting bug reports is bugs.launchpad.net/maria You don't need to join a team to use it. I've submitted a bug report on your behalf: https://bugs.launchpad.net/maria/+bug/955760 Regards, Sergei

1 0

Re: [Maria-developers] [Commits] Rev 3329: MDEV-15 Log SQL errors. in file:///home/hf/wmar/mdev15/
by Sergei Golubchik 14 Mar '12

14 Mar '12

Hi, Holyfoot! On Mar 14, holyfoot(a)askmonty.org wrote: > revno: 3329 > revision-id: holyfoot(a)askmonty.org-20120314123749-5kdm2u6qxrd1wtae > parent: holyfoot(a)askmonty.org-20120314054054-64q35vr6254t2ja6 > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev15 > timestamp: Wed 2012-03-14 16:37:49 +0400 > message: > MDEV-15 Log SQL errors. > mysys/my_logger.c was moved to sql/sql_logger.c > Logger service was rewritten with file functions instead of stream, so it > can handle huge files. Ok for me Regards, Sergei

1 0

Re: [Maria-developers] MDEV-15 Log all SQL errors. in file:///home/hf/wmar/mdev15/
by Sergei Golubchik 14 Mar '12

14 Mar '12

Hi, Holyfoot! Just two comments, see below. Please fix and push ASAP! On Mar 13, holyfoot(a)askmonty.org wrote: > > ------------------------------------------------------------ > revno: 3320 > revision-id: holyfoot(a)askmonty.org-20120313160142-ljcsacc11zb34uu6 > parent: sergii(a)pisem.net-20120309082045-iyihz9ysqo82qb71 > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev15 > timestamp: Tue 2012-03-13 20:01:42 +0400 > message: > MDEV-15 Log all SQL errors. > The logger service added to provide the rotating log functions. > The SQL_ERROR_LOG plugin created to log the SQL errors usint that logger service. > === added file 'include/mysql/service_logger.h' > --- a/include/mysql/service_logger.h 1970-01-01 00:00:00 +0000 > +++ b/include/mysql/service_logger.h 2012-03-13 16:01:42 +0000 > + > +typedef struct logger_service_file_st LOGGER_SERVICE_FILE; small comment: please, rename to LOGGER_HANDLE or LOGGER_DESCRIPTOR, or, say, MYSQL_LOGGER. The point is to avoid the word "FILE", because, in principle, it may log to syslog or to a table or whatever. (and better to avoid SERVICE too, because 1) this structure is not a service, it's a handle, 2) services are supposed to be transparent and invisible, they pretend to be regular function calls) > +maria_declare_plugin(sql_errlog) > +{ > + MYSQL_AUDIT_PLUGIN, > + &descriptor, > + "SQL_ERROR_LOG", > + "Alexey Botchkov", > + "Log SQL level errors to a file with rotation", > + PLUGIN_LICENSE_GPL, > + sql_error_log_init, > + sql_error_log_deinit, > + 0x0100, > + NULL, > + vars, > + NULL, > + 0 Fix this, please. Two last values are - version (as a string), and maturity. For example, "1.0", MariaDB_PLUGIN_MATURITY_ALPHA > +} > +maria_declare_plugin_end; Regards, Sergei

2 2

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 13 Mar '12

13 Mar '12

On Mon, Mar 12, 2012 at 1:16 PM, Timour Katchaounov <timour(a)montyprogram.com> wrote: > Hello Mark! > > In summary, the feature is ready. It has been reviewed by Monty, and > tested by Elena via the random query generator. All known bugs have been > fixed. The implementation turned out to be a lot more tricky than > initially expected. I hope the result is satisfactory. These are > the main changes/highlights since our last email exchange: Thank you. > - The implementation still allows the query engine to have what I call > "momentum". In various cases it is possible that the query engine > examines even an order of magnitude more rows than the give row limit. This is OK for us. We won't be using it in those cases. > Given that we cannot push this feature into 5.3 (it is GA), an important > question is whether I should continue maintaining the 5.3 version of the > feature in addition to the released version in 5.5. You don't need to maintain the 5.3 version. -- Mark Callaghan mdcallag(a)gmail.com

1 0

Re: [Maria-developers] [Commits] mdev-15 sql log errors
by Sergei Golubchik 09 Mar '12

09 Mar '12

Hi, Alexey! On Mar 09, Alexey Botchkov wrote: > 3316 Alexey Botchkov 2012-03-09 > MDEV-15 Log all SQL errors. > Added the logger service that provides us with the rotating logs. > The plugin SQL_ERROR_LOG added. It logs the errors using the 'logger service' > for the rotating log files. > the example record from the log: > 2012-03-09 15:07:29 root[root] @ localhost [] ERROR 1146: Table 'test.xyz' doesn't exist : select * from test.xyz Pretty much ok. See comments below. Six of them (that use imperative) I ask you to do. The rest are suggestions, opinions, or questions. And one question (static declaration of logs) I will discuss with you on irc. > === added file 'include/mysql/service_logger.h' > --- include/mysql/service_logger.h 1970-01-01 00:00:00 +0000 > +++ include/mysql/service_logger.h 2012-03-07 10:29:14 +0000 > @@ -0,0 +1,97 @@ > +/* Copyright (C) 2012 Monty Program Ab > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; version 2 of the License. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ > + > +#ifndef MYSQL_SERVICE_LOGGER_INCLUDED > +#define MYSQL_SERVICE_LOGGER_INCLUDED > + > +#ifndef MYSQL_ABI_CHECK > +#include <stdarg.h> > +#endif > + > +/** > + @file > + logger service > + > + Log file with rotation implementation. > + > + This service implements logging with possible rotation > + of the log files. Interface intentionally tries to be similar to FILE* > + related functions. > + > + So that one can open the log with logger_open(), specifying > + the limit on the logfile size and the rotations number. > + > + Then it's possible to write messages to the log with > + logger_printf or logger_vprintf functions. > + > + As the size of the logfile grows over the specified limit, > + it is renamed to 'logfile.1'. The former 'logfile.1' becomes > + 'logfile.2', etc. The file 'logfile.rotations' is removed. > + That's how the rotation works. > + > + The rotation can be forced with the logger_rotate() call. > + > + Finally the log should be closed with logger_close(). > + > +@notes: > + Implementation checks the size of the log file before it starts new > + printf into it. So the size of the file gets over the limit when it rotates. > + > + The access is secured with the mutex, so the log is threadsafe. > +*/ > + > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +typedef struct logger_service_file_st LOGGER_SERVICE_FILE; > + > +extern struct logger_service_st { > + LOGGER_SERVICE_FILE* (*open)(const char *path, > + unsigned long size_limit, > + unsigned int rotations); > + int (*close)(LOGGER_SERVICE_FILE *log); > + int (*vprintf)(LOGGER_SERVICE_FILE *log, const char *fmt, va_list argptr); > + int (*printf)(LOGGER_SERVICE_FILE *log, const char *fmt, ...); > + int (*rotate)(LOGGER_SERVICE_FILE *log); > +} *logger_service; > + > +#ifdef MYSQL_DYNAMIC_PLUGIN > + > +#define logger_open logger_service->open you can write this with parentheses #define logger_open(P,L,R) logger_service->open(P,L,R) > +#define logger_close(log) (logger_service->close(log)) > +#define logger_rotate(log) (logger_service->rotate(log)) > +#define logger_vprintf(log, fmt, argptr) (logger_service->\ > + vprintf(log, fmt, argptr)) > +#define logger_printf logger_service->printf > +#else > + > + LOGGER_SERVICE_FILE *logger_open(const char *path, > + unsigned long size_limit, > + unsigned int rotations); > + int logger_close(LOGGER_SERVICE_FILE *log); > + int logger_vprintf(LOGGER_SERVICE_FILE *log, const char *fmt, va_list argptr); > + int logger_rotate(LOGGER_SERVICE_FILE *log); > + int logger_printf(LOGGER_SERVICE_FILE *log, const char *fmt, ...); > +#endif > + > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /*MYSQL_SERVICE_LOGGER_INCLUDED*/ > + > === added file 'mysys/my_logger.c' > --- mysys/my_logger.c 1970-01-01 00:00:00 +0000 > +++ mysys/my_logger.c 2012-03-09 13:03:47 +0000 > @@ -0,0 +1,167 @@ > +/* Copyright (C) 2012 Monty Program Ab > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; version 2 of the License. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ > + > + > +#include "my_global.h" > +#include <my_sys.h> > +#include <mysql/service_logger.h> > + > +extern MYSQL_PLUGIN_IMPORT char *mysql_data_home; why MYSQL_PLUGIN_IMPORT? Because the linker cannot find the symbol otherwise? that is, MYSQL_PLUGIN_IMPORT affects how the name is mangled? > +extern PSI_mutex_key key_LOCK_logger_service; > + > +typedef struct logger_service_file_st { > + FILE *file; > + char path[FN_REFLEN]; > + long size_limit; > + unsigned int rotations; > + unsigned int index_len; > + size_t path_len; > + mysql_mutex_t lock; > +} LSFS; > + > + > +static unsigned int n_dig(unsigned int i) > +{ > + return (i == 0) ? 0 : ((i < 10) ? 1 : ((i < 100) ? 2 : 3)); > +} > + > + > +LOGGER_SERVICE_FILE *logger_open(const char *path, > + unsigned long size_limit, > + unsigned int rotations) > +{ > + LOGGER_SERVICE_FILE new_log, *l_perm; > + > + /* I don't think we need more rotations, */ > + /* but if it's so, the rotation procedure should be adapted to it. */ please write multi-line comments as we do elsewhere in the code > + if (rotations > 999) > + return 0; > + > + new_log.rotations= rotations; > + new_log.size_limit= size_limit; > + new_log.index_len= n_dig(rotations); I don't think you need to cache the value of n_dig(rotations) it's only used once, in logname() function. > + new_log.path_len= strlen(fn_format(new_log.path, path, > + mysql_data_home, "", 4)); replace 4 with a named constant, they exist in 5.5 > + > + if (new_log.path_len+new_log.index_len+1 > FN_REFLEN || > + !(new_log.file= fopen(new_log.path, "a+"))) > + { > + /* File path too long || Check errno for the cause */ set errno=ENAMETOOLONG here. That is, split this if() in two, and set errno appropriately in the first one. > + return 0; > + } > + > + setbuf(new_log.file, 0); > + fseek(new_log.file, 0, SEEK_END); > + if (!(l_perm= (LOGGER_SERVICE_FILE *) > + my_malloc(sizeof(LOGGER_SERVICE_FILE), MYF(0)))) close the file here > + return 0; /* End of memory */ > + *l_perm= new_log; > + mysql_mutex_init(key_LOCK_logger_service, &l_perm->lock, MY_MUTEX_INIT_FAST); > + return l_perm; > +} > + > +int logger_close(LOGGER_SERVICE_FILE *log) > +{ > + int result; > + mysql_mutex_destroy(&log->lock); > + result= fclose(log->file); > + my_free(log); > + return result; > +} > + > + > +static char *logname(LOGGER_SERVICE_FILE *log, char *buf, unsigned int n_log) > +{ > + unsigned int n_zeroes; > + size_t path_len= log->path_len; > + buf[path_len++]= '.'; > + for (n_zeroes= log->index_len - n_dig(n_log); > + n_zeroes > 0; n_zeroes--, path_len++) > + buf[path_len]= '0'; > + > + int10_to_str(n_log, buf+path_len, 10); > + return buf; as I wrote earlier, I'd simply used sprintf("%0*d") here. Like this: sprintf(buf + path_len, ".%0*u", log->index_len, n_log); but ok, as you like. > +} > + > + > +static int do_rotate(LOGGER_SERVICE_FILE *log) > +{ > + char namebuf[FN_REFLEN]; > + struct stat stbuf; > + int result; > + unsigned int i; > + char *buf_old, *buf_new, *tmp; > + > + memcpy(namebuf, log->path, log->path_len); > + > + buf_new= logname(log, namebuf, log->rotations); > + buf_old= log->path; > + for (i=log->rotations-1; i>0; i--) > + { > + logname(log, buf_old, i); > + if (!stat(buf_old, &stbuf) && why stat? iirc, access(name, F_OK) is supposed to be used for checking if a file exists. We aren't interested in the values from stbuf here, are we? > + (result= my_rename(buf_old, buf_new, MYF(0)))) > + return result; > + tmp= buf_old; > + buf_old= buf_new; > + buf_new= tmp; > + } > + if ((result= fclose(log->file))) > + return result; > + namebuf[log->path_len]= 0; > + result= my_rename(namebuf, logname(log, log->path, 1), MYF(0)); > + log->file= fopen(namebuf, "a+"); > + return log->file==NULL || result; > +} > + > + > +int logger_vprintf(LOGGER_SERVICE_FILE *log, const char* fmt, va_list ap) > +{ > + int result; > + mysql_mutex_lock(&log->lock); > + if (ftell(log->file) >= log->size_limit && > + do_rotate(log)) > + { > + result= -1; > + goto exit; /* Log rotation needed but failed */ > + } > + > + result= vfprintf(log->file, fmt, ap); use my_vfprintf > +exit: > + mysql_mutex_unlock(&log->lock); > + return result; > +} > + > + > +int logger_rotate(LOGGER_SERVICE_FILE *log) > +{ > + int result; > + mysql_mutex_lock(&log->lock); > + result= do_rotate(log); > + mysql_mutex_unlock(&log->lock); > + return result; > +} > + > + > +int logger_printf(LOGGER_SERVICE_FILE *log, const char *fmt, ...) > +{ > + int result; > + va_list args; > + va_start(args,fmt); > + result= logger_vprintf(log, fmt, args); > + va_end(args); > + return result; > +} > + > === added file 'plugin/sql_errlog/sql_errlog.c' > --- plugin/sql_errlog/sql_errlog.c 1970-01-01 00:00:00 +0000 > +++ plugin/sql_errlog/sql_errlog.c 2012-03-09 10:24:35 +0000 > @@ -0,0 +1,147 @@ > +/* Copyright (C) 2012 Monty Program Ab. > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; version 2 of the License. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with this program; if not, write to the Free Software > + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ > + > +#include <mysql/plugin_audit.h> > +#include <stdio.h> > +#include <time.h> > + > +/* > + rate 0 means the logging was disabled. > +*/ > + > +static char *filename; > +static unsigned int rate; > +static unsigned int size_limit; > +static unsigned int rotations; > +static char rotate; > + > +static unsigned int count; > +LOGGER_SERVICE_FILE *logfile; > + > +static void rotate_log(MYSQL_THD thd, struct st_mysql_sys_var *var, > + void *var_ptr, const void *save); > + > +static MYSQL_SYSVAR_UINT(rate, rate, PLUGIN_VAR_RQCMDARG, > + "Sampling rate. If set to 0(zero), the logging disabled.", NULL, NULL, typo: the logging *is* disabled > + 1, 0, 1000000, 1); > + > +static MYSQL_SYSVAR_UINT(size_limit, size_limit, > + PLUGIN_VAR_READONLY, "Log file size limit", NULL, NULL, > + 1000000, 100, 1024*1024L*1024L, 1); > + > +static MYSQL_SYSVAR_UINT(rotations, rotations, > + PLUGIN_VAR_READONLY, "Number of rotations before log is removed.", > + NULL, NULL, 9, 1, 999, 1); > + > +static MYSQL_SYSVAR_BOOL(rotate, rotate, > + PLUGIN_VAR_NOSYSVAR, "Force log rotation", NULL, rotate_log, What do you mean PLUGIN_VAR_NOSYSVAR? It only works from a command line? It'd be more useful to force a log rotation from SQL. if users wouldn't need it, we woldn't have FLUSH LOGS :) > + 0); > + > +static MYSQL_SYSVAR_STR(filename, filename, > + PLUGIN_VAR_READONLY | PLUGIN_VAR_RQCMDARG, > + "The file to log sql errors to", NULL, NULL, > + "sql_errors.log"); > + > +static struct st_mysql_sys_var* vars[] = { > + MYSQL_SYSVAR(rate), > + MYSQL_SYSVAR(size_limit), > + MYSQL_SYSVAR(rotations), > + MYSQL_SYSVAR(rotate), > + MYSQL_SYSVAR(filename), > + NULL > +}; > + > + > +static void log_sql_errors(MYSQL_THD thd __attribute__((unused)), > + unsigned int event_class __attribute__((unused)), > + const void *ev) > +{ > + const struct mysql_event_general *event = > + (const struct mysql_event_general*)ev; > + if (rate && > + event->event_subclass == MYSQL_AUDIT_GENERAL_ERROR) > + { > + if (++count >= rate) > + { > + struct tm t; > + time_t event_time = event->general_time; > + > + count = 0; > + localtime_r(&event_time, &t); > + logger_printf(logfile, "%04d-%02d-%02d %2d:%02d:%02d " > + "%s ERROR %d: %s : %s\n", > + t.tm_year + 1900, t.tm_mon + 1, > + t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, > + event->general_user, event->general_error_code, > + event->general_command, event->general_query); > + } > + } > +} > + > + > +static int sql_error_log_init(void *p __attribute__((unused))) > +{ > + logfile= logger_open(filename, size_limit, rotations); > + if (logfile == NULL) { > + fprintf(stderr, "Could not create file '%s'\n", > + filename); > + return 1; > + } > + count = 0; > + return 0; > +} > + > + > +static int sql_error_log_deinit(void *p __attribute__((unused))) > +{ > + logger_close(logfile); > + return 0; > +} > + > + > +static void rotate_log(MYSQL_THD thd __attribute__((unused)), > + struct st_mysql_sys_var *var __attribute__((unused)), > + void *var_ptr __attribute__((unused)), > + const void *save __attribute__((unused))) > +{ > + (void) logger_rotate(logfile); > +} > + > + > +static struct st_mysql_audit descriptor = > +{ > + MYSQL_AUDIT_INTERFACE_VERSION, > + NULL, > + log_sql_errors, > + { MYSQL_AUDIT_GENERAL_CLASSMASK } > +}; > + > +maria_declare_plugin(sql_errlog) > +{ > + MYSQL_AUDIT_PLUGIN, > + &descriptor, > + "SQL_ERROR_LOG", > + "Alexey Botchkov", > + "Log SQL level errors to a file with rotation", > + PLUGIN_LICENSE_GPL, > + sql_error_log_init, > + sql_error_log_deinit, > + 0x0100, > + NULL, > + vars, > + NULL, > + 0 > +} > +maria_declare_plugin_end; Regards, Sergei

1 0

Re: [Maria-developers] Clang build failure
by Kristian Nielsen 05 Mar '12

05 Mar '12

Terin Stock <terinjokes(a)gmail.com> writes: >> Could it be that Clang is lying to autoconf in Xcode 4.3, pretending to be >> GCC? Maybe it would be worth investigating, and filing a bug against Clang or >> Autoconf, if appropriate. > It's possible this is the case, my configure output: > checking whether we are using the GNU C compiler… yes > It looks like autoconf checks for the GCC C compiler by seeing if __GNUC__ is defined. If it is, the code is compiled and no errors happen. If it isn't, it fails to compile, and autoconf treats that as not being the C compiler. Maybe this is a Clang bug then. If Clang wants to pretend it is GCC, then it needs to work the same way... Perhaps a bug should be filed against Clang that the preprocessor option -dI is not working correctly (especially since Clang apparently accepts the option without error, so they seem to have intended to implement it). If you can come up with something for configure.in that works-around the Clang problem until it might be fixed we will be happy to include it (it should be possible to do without changing autoconf itself). - Kristian.

1 0

[Maria-developers] Documenation for MWL#234
by Kristian Nielsen 02 Mar '12

02 Mar '12

Hi Daniel, Here is another new feature in 5.5 that needs documentation: I have now pushed MWL#234, @@skip_replication, into MariaDB 5.5.21. User documentation is written up in the worklog: http://askmonty.org/worklog/Server-Sprint/?tid=234#hld Can you get the text added to the knowledgebase, and also add something to the release notes? Thanks, - Kristian.

2 1

[Maria-developers] Clang build failure
by Terin Stock 01 Mar '12

01 Mar '12

MariaDB 5.3.5, 5.2.10 and possibly other versions, fails to compile using Apple's Clang compiler. As of Xcode 4.3, Clang is the default compiler, replacing LLVM-GCC. The issue seems to occur when checking for an ABI incompatibility in mysql.h. As Clang preprocesses the file differently than GCC, the output is different, which fails the abi_check. MariaDB compiles fine using the non-default LLVM-GCC compiler. https://gist.github.com/1944688 -- #Terin Stock

2 1

Re: [Maria-developers] How to check for active transaction?
by Kristian Nielsen 29 Feb '12

29 Feb '12

Davi Arnaut <davi(a)twitter.com> writes: >>> I have a session variable @@skip_replication. I want to ensure that this >>> variable is not modified in the middle of a statement or while a transaction >>> is active. > Copy and paste fail. I meant THD::in_multi_stmt_transaction_mode. Try > to avoid using the flag directly, in the 5.5 cycle we cleaned up some > of this stuff. Thanks Davi! I also need to check if one is in the middle of a statement, ie to prevent this: CREATE FUNCTION foo (x INT) RETURNS INT BEGIN SET SESSION skip_replication=x; RETURN x; END UPDATE t1 SET b=foo(0); It seems to work with this: if (thd->locked_tables_mode || thd->in_active_multi_stmt_transaction()) ... but I am not sure if this is the correct way? - Kristian.

1 0

[Maria-developers] 5.3.5 GA release : binaries are ready and tagged
by Sergei Petrunia 29 Feb '12

29 Feb '12

Hi Daniel, MariaDB 5.3.5 GA has been built by buildbot and is ready for upload/release. Tip revision number is 3450, tarbuildnum: 180 I've also made a tag: mariadb-5.3.5-ga Could you please make the rest of the release steps? I'm available to help if there are any problems. (I will also look through the changes to see what should be highlighted in the changelog). BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 5

Re: [Maria-developers] regex enhancements
by Line Bie Pedersen 29 Feb '12

29 Feb '12

Hi Sergei, > I have some questions related to this project, foremost are of course > > what kind of enhancement are you looking for? Are you looking for an > > update of existing code? I looked at the existing code and it seems to > > be the old regex library written by Henry Spencer. I did not look into > > it in detail, so I have no clear idea of the changes needed to bring > > it up to speed. Or are you looking to upgrade with an existing > > library? Or perhaps a rewrite suited to your needs? I can't see if you > > use the regex library for anything but deciding simple acceptance, but > > this would probably be a big factor in deciding. I would be happy to > > look into all three suggestions, or even a fourth, if you prefer > > something else. > > There're two answers to that. > > The first one - on the level of requirements, I am very much looking for > multi-byte support in the regex library. And REGEX_REPLACE() function > would be nice too - users ask for it quite often. How will the REGEX_REPLACE() function work? The second answer - I thought that the simple way of getting multi-byte > support, would be to remove Henry Spencer library, and put some modern > regex implementation instead. That could be relatively easy to do for > any undegraduate student with little experience - this task was one > of ideas we had for Google Summer of Code. > Agree, this is the simple solution. Did you already have a library picked out? Are there any requirements to license and language? Would it be useful if you could limit the amount of memory the library can use? > Now, with your experience, you may prefer to do something else - > not replace the library, but rewrite it, or extend, whatever. > I'm fine either way. It's only important that the result works with > multi-byte character sets (ideally - our character set code), and that > it can support Henry Spencer regex syntax. > What I would really like to do, is rewrite the thing! However, I do not have an unlimited amount of time for this project. I'll look into Henry Spencers old library and let you know what I decide to do. -- Line Bie Pedersen

2 1

[Maria-developers] How to check for active transaction?
by Kristian Nielsen 29 Feb '12

29 Feb '12

Hi Serg, I'm merging MWL#234 into 5.5. I have a session variable @@skip_replication. I want to ensure that this variable is not modified in the middle of a statement or while a transaction is active. (The reason for this is that it changes whether changes are replicated or not - and so changing in the middle of statement or transaction could cause us to replicate only half of the event/transaction). In my 5.2-based tree, I had this condition, but this seems to no longer work: thd->locked_tables || thd->active_transaction() Can you help me find how to do this check in 5.5 code base? - Kristian.

2 1

[Maria-developers] Documentation for MWL#192: non-blocking client API
by Kristian Nielsen 28 Feb '12

28 Feb '12

Hi Daniel! I have pushed MWL#192. It will be included in upcoming MariaDB 5.5.21. So we need documentation of the feature :-) I have written a first draft of this. I included it in the high-level description in the WL: http://askmonty.org/worklog/Client-Sprint/?tid=192#hld There are two things I would ask of you: 1. Can you take the text and prepare it properly for the Knowledgebase? Find an appropriate place, split it up as/if needed, handle markup/formatting? And feel free to correct my text in any way you see fit. 2. The last part, "Non-blocking API reference", is basically a long list of all the new functions and their parameters. In the draft, I just listed them, along with specific comments to a few of them as relate to the new feature. For the majority of them, they are just direct translation of the corresponding functions from the old client library, which is documented in the MySQL manual. Can you help with a suggestion on how to present this in a nice way? Maybe you want to format them each individually in some nice way, maybe link to the MySQL manual? Any suggestion and/or help is appreciated. Can you take over from here? Of course, just let me know if there is anything lacking that you need me to do, or any questions or so on. (The task is not urgent as such - the feature will be available from the next MariaDB 5.5 release, which is as yet unscheduled - maybe in 2-3 weeks?) - Kristian.

2 1

[Maria-developers] Text for 5.5.21 documentation and release notes
by Kristian Nielsen 28 Feb '12

28 Feb '12

Hi Daniel, I have pushed MWL#192 to 5.5.21. This introduces a minor change in functionality. I hope you can find a good place to put this in the documentation/knowledgebase. Here is suggested text, let me know if you have questions, and feel free to improve the text as you like: "In MySQL, and in MariaDB versions before 5.5.21, mysql_real_connect() removes from the MYSQL object any options set with mysql_option() when it fails. From MariaDB 5.5.21, options are preserved by a failing mysql_real_connect(); use mysql_close(), as normal, to clear them. This only has effect if the MYSQL object is reused after a mysql_real_connect() failure (which is unusual). No real-life incompatibilities are expected from this change; it is unlikely that an application will rely on options being automatically removed between connection attempts." (I am preparing information for you to fully document the new MWL#192 feature; I will send it to you later). - Kristian.

2 1

[Maria-developers] Upgrading from MySQL 5.0.34 to MariaDB 5.3.4
by Bruce Carlson 28 Feb '12

28 Feb '12

Hi to all, Firstly, I'm new here and not sure of the correct place to ask for this type of assistance but i'm hoping someone can help. I have been using MySQL enterprise in a company production environment for many years. We run 5 databases in a daisy chained replication system on five servers in five cities across Australia. This has worked flawlessly since 2007 when we setup MySQL version 3.0.34. It worked flawlessly before then too but back then we were still learning how much MySQL could do. Our first full production version was 5.0.34. We have had enterprise licenses from MySQL for the five servers ever since we started with mySQL in 2003. When MySQL was aquired by Sun the level of service provided remained extremely high with the only real change being that our account manager changed from being Iko in Europe to Ralph in Australia. (I still have the greatest respect for both Iko and Ralph. I wish I could say the same for Oracle.) The average time for a resolution of help issues submitted was less than one hour, the best was 11 minutes from submission to resolution, I was extemely happy with this but since MySQL has been taken over by Oracle I have not been able to get system suport at all. I mean -- never... not once.... Even after spending many hours trying to follow the instructions to get help from the Oracle help system and after paying many thousands of dollars to buy the suport still nothing from MySQL/Oracle suport. They are the most arrogant and rude organisiation I've ever had to deal with. I have began to look at moving to Maria DB as an alternative, especially since the MariaDB project is made up of many of the original MySQL people. In recent weeks we have upgraded much of our company's infrastructure and now have new servers running win server 2008 64 bit OS but three of our DB servers are still running the old win 32 bit 2003 server OS. The older servers are still running MySQL 5.0.34 enterprise (I have not upgraded for years because the system has not stopped for even one second since we finalised the configuration in 2007. That in it's self is an indication of how good the program is.) Since installing the new servers at two of our sites I have had to pull them out of the replicator chain and link those sites to the main server in Sydney. This is causing big delays in the sites with the new servers and I need to get them back into the replicator ASAP. I have a plan to replace all our MySQL servers with MariaDB because I can no longer suffer the awfull disgusting lack of suport from Oracle. I have installed MariaDB 5.3.4 on the new server in Perth as a test and a starting point but I can not get it to load up data from an .sql dump file created by the older MySQL version 5.0.34. (Not Suprised given the age of the older versions) The syntax I use for creating the dump file is :- "mysqldump --opt --user=specialUser1 --password=specialpassword1 --routines mydatabase > mydatadump.sql" This brings me to my three questions. 1. Can I run version 5.3.4 with any other version in a daisy chain replication environment? 2. is there a way that I can dump all tables, views, procedures, functions, triggers and users from the old 5.0.34 version to the new 5.3.4 version for a selected DB schema? 3. Can I run MariaDB 5.3.4 on a mixture of 32 bit Win Server 2003 and 64 bit Win Server 2008 OS's and still get them to replicate Future direction... I am keen to move away from MySQL/Oracle and have noted at least one other company (SkyDB) that offers enterprise solutions for MariaDB. I would like to hear from anyone who has more information on enterprise solutions available for MariaDB. Our current agreement with MySQL ends at the end of March and I hope to be well clear of Oracle before then as I do not want to spend another ten to twenty thousand US dollars just to get nothing in return again, like the last two years. Thanks and Best Regards, Bruce Carlson. (Business Systems Manager) (www.Nepean.com) -- This message was sent from Launchpad by Bruce Carlson (https://launchpad.net/~bruce-carlson) to each member of the Maria Discuss team using the "Contact this team" link on the Maria Discuss team page (https://launchpad.net/~maria-discuss) For more information see https://help.launchpad.net/YourAccount/ContactingPeople

1 0

[Maria-developers] MariaDB 5.5.20 Alpha
by Daniel Bartholomew 26 Feb '12

26 Feb '12

All, Nearly all of the mirrors have the MariaDB 5.5.20 Alpha packages and source tarball now, so I've gone ahead and activated the various pages for the release. The release notes are pretty sparse at the moment. If there is anything that should be added to them, please let me know ASAP, or jump in and add it directly. http://kb.askmonty.org/en/mariadb-5520-release-notes http://kb.askmonty.org/en/mariadb-5520-changelog http://downloads.askmonty.org/mariadb/5.5.20/ Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] BUG#939009: Making sj-materialized fields non-nullable doesn't remove the crash
by Sergei Petrunia 23 Feb '12

23 Feb '12

Hello Igor, I've made a patch that makes temporary table's fields non-nullable. It still has one part missing, but I have discovered that it will not remove the crash. I was able to construct an example with inner join and a non-nullable key field for which best_access_path() will still access rec_per_key[...]. <testcase> create table t21 (a int NOT NULL, b int, key(a)); # note the NOT NULL key column... # we can make the key unique: create table t21a (a int NOT NULL, b int, unique key(a)); insert into t21 select a,a from test.one_k; explain select * from t21a where a=b and (b=10 or b is null); </testcase> When I debug the above EXPLAIN, I get this execution in best_access_path(): if (found_part == PREV_BITS(uint,keyinfo->key_parts) && !ref_or_null_part) //(branch not taken) if ((found_part & 1) && (!(table->file->index_flags(key, 0, 0) & HA_ONLY_WHOLE_INDEX) || found_part == PREV_BITS(uint,keyinfo->key_parts))) { //(branch taken) if (table->quick_keys.is_set(key) && !found_ref && //(C1) table->quick_key_parts[key] == max_key_part && //(C2) table->quick_n_ranges[key] == 1+test(ref_or_null_part)) //(C3) { //(branch not taken) tmp= records= (double) table->quick_rows[key]; } else { //(we end up here, where the crash is) /* Check if we have statistic about the distribution */ if ((records= keyinfo->rec_per_key[max_key_part-1])) Conclusion: marking temporary table's field as NOT NULL will not cause best_access_path to avoid accessing the " rec_per_key[max_key_part-1] " part. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] On whether BUG#920132 is repeatable in mysql-5.6
by Sergei Petrunia 22 Feb '12

22 Feb '12

<igor> spetrunia: so does mysql-5.6 contains a fix for that ICP bug #920132? It doesn't have the fix. They don't have the bug either, though. mysql-5.6 will execute the subquery at optimization phase and remove it from the WHERE. The stack trace will look like this: (gdb) wher 20 #0 JOIN::exec (this=0x977cf40) at /home/psergey/dev2/mysql-server-trunk/sql/sql_executor.cc:129 #1 0x0851962c in subselect_single_select_engine::exec (this=0x97227d0) at /home/psergey/dev2/mysql-server-trunk/sql/item_subselect.cc:2517 #2 0x0851fee2 in Item_subselect::exec (this=0x9722728) at /home/psergey/dev2/mysql-server-trunk/sql/item_subselect.cc:340 #3 0x08515902 in Item_exists_subselect::val_bool (this=0x9722728) at /home/psergey/dev2/mysql-server-trunk/sql/item_subselect.cc:1005 #4 0x0822a144 in Item_func_not::val_int (this=0x97227f0) at /home/psergey/dev2/mysql-server-trunk/sql/item_cmpfunc.cc:290 #5 0x0825abff in eval_const_cond (cond=0x97227f0) at /home/psergey/dev2/mysql-server-trunk/sql/item_func.cc:79 #6 0x0839c385 in internal_remove_eq_conds (thd=0x964a390, cond=0x97227f0, cond_value=0xa95a9fb4) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:8127 #7 0x0839be6b in internal_remove_eq_conds (thd=0x964a390, cond=0x9722870, cond_value=0xa95aa054) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:7991 #8 0x0839be6b in internal_remove_eq_conds (thd=0x964a390, cond=0x9722918, cond_value=0x964babc) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:7991 #9 0x0839c71b in remove_eq_conds (thd=0x964a390, cond=0x9722918, cond_value=0x964babc) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:8220 #10 0x083ad51f in optimize_cond (join=0x977cbc8, conds=0x9722918, join_list=0x964bb18, build_equalities=true, cond_value=0x964babc) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:7947 #11 0x083adde9 in JOIN::optimize (this=0x977cbc8) at /home/psergey/dev2/mysql-server-trunk/sql/sql_optimizer.cc:246 #12 0x083f7efa in mysql_select (thd=0x964a390, tables=0x9721298, wild_num=1, fields=..., conds=0x9722918, og_num=0, order=0x0, group=0x0, having=0x0, proc_param=0x0, select_options=2147748612, result=0x9722a38, unit=0x964b5ec, select_lex=0x964ba48) at /home/psergey/dev2/mysql-server-trunk/sql/sql_select.cc:1074 so by the time we get to push_index_cond(), subquery will no longer be in the WHERE clause. As far as I udnerstand, we don't want this behavior, all subuqueries are expensive and should not be executed in EXPLAIN. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] WL#249 New (by Monty): Locking SQL_MODE against client changes
by worklog-noreply＠askmonty.org 21 Feb '12

21 Feb '12

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Locking SQL_MODE against client changes CREATION DATE..: Tue, 21 Feb 2012, 19:36 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 249 (http://askmonty.org/worklog/?tid=249) VERSION........: WorkLog-4.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 4 (hours remain) ORIG. ESTIMATE.: 4 PROGRESS NOTES: DESCRIPTION: Add an option to lock sql_mode against client-side changes. For example: mysqld --lock_sql_mode ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] Please review: Rev 3275: BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050
by Sergei Petrunia 20 Feb '12

20 Feb '12

Hello Sanja, Igor, Could you please review the below? The new code, Item_cache::walk() passes the main testsuite and fixed the bug, however I'm concerned it may have implications that I am not aware of. ----- Forwarded message from Sergey Petrunya <psergey(a)askmonty.org> ----- From: Sergey Petrunya <psergey(a)askmonty.org> To: commits(a)mariadb.org X-Mailer: mail (GNU Mailutils 1.2) Date: Tue, 21 Feb 2012 01:50:51 +0400 (GST) Subject: [Commits] Rev 3275: BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050 in file:///home/psergey/dev2/5.5-look5/ At file:///home/psergey/dev2/5.5-look5/ ------------------------------------------------------------ revno: 3275 revision-id: psergey(a)askmonty.org-20120220215050-ovuvi8qigyidenum parent: psergey(a)askmonty.org-20120220210822-6yumujmervtemmwy committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: 5.5-look5 timestamp: Tue 2012-02-21 01:50:50 +0400 message: BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050 - MySQL 5.5 introduced caching of constant items by means of wrapping them in Item_cache_XXX objects. If a subquery was wrapped in this cache, it could end up being pushed down by ICP. - The fix is to add Item_cache::walk() which lets ICP to see that the cache item has a subquery inside it, and disable pushdown for this case. === modified file 'mysql-test/r/innodb_icp.result' --- a/mysql-test/r/innodb_icp.result 2012-01-13 14:50:02 +0000 +++ b/mysql-test/r/innodb_icp.result 2012-02-20 21:50:50 +0000 @@ -808,5 +808,34 @@ 1478 SET optimizer_switch=@save_optimizer_switch; DROP TABLE t1,t2; +# +# BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050 +# +CREATE TABLE t1 ( a INT ) +ENGINE=InnoDB; +INSERT INTO t1 VALUES (7),(7); +CREATE TABLE t2 ( b VARCHAR(1) ); +INSERT INTO t2 VALUES ('j'),('v'); +CREATE TABLE t3 ( +c INT, d VARCHAR(1), e VARCHAR(1), +KEY (d,c) +) ENGINE=InnoDB; +INSERT INTO t3 +VALUES (6,'w','w'), +(1,'v','v'),(7,'s','s'),(4,'l','l'), +(7,'y','y'),(0,'c','c'),(2,'i','i'), +(9,'h','h'),(4,'q','q'),(0,'a','a'), +(9,'v','v'),(1,'u','u'),(3,'s','s'), +(8,'z','z'),(1,'h','h'),(8,'p','p'), +(6,'e','e'),(3,'i','i'),(6,'y','y'); +SELECT * +FROM t1 INNER JOIN t2 INNER JOIN t3 +ON d = b +WHERE +NOT EXISTS ( SELECT * FROM t3 ) +OR a = c +ORDER BY e; +a b c d e +DROP TABLE t1,t2,t3; set optimizer_switch=@innodb_icp_tmp; set storage_engine= @save_storage_engine; === modified file 'mysql-test/t/innodb_icp.test' --- a/mysql-test/t/innodb_icp.test 2011-07-08 14:46:47 +0000 +++ b/mysql-test/t/innodb_icp.test 2012-02-20 21:50:50 +0000 @@ -12,6 +12,39 @@ --source include/icp_tests.inc +--echo # +--echo # BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050 +--echo # +CREATE TABLE t1 ( a INT ) + ENGINE=InnoDB; +INSERT INTO t1 VALUES (7),(7); + +CREATE TABLE t2 ( b VARCHAR(1) ); +INSERT INTO t2 VALUES ('j'),('v'); + +CREATE TABLE t3 ( + c INT, d VARCHAR(1), e VARCHAR(1), + KEY (d,c) +) ENGINE=InnoDB; +INSERT INTO t3 + VALUES (6,'w','w'), + (1,'v','v'),(7,'s','s'),(4,'l','l'), + (7,'y','y'),(0,'c','c'),(2,'i','i'), + (9,'h','h'),(4,'q','q'),(0,'a','a'), + (9,'v','v'),(1,'u','u'),(3,'s','s'), + (8,'z','z'),(1,'h','h'),(8,'p','p'), + (6,'e','e'),(3,'i','i'),(6,'y','y'); + +SELECT * +FROM t1 INNER JOIN t2 INNER JOIN t3 + ON d = b +WHERE + NOT EXISTS ( SELECT * FROM t3 ) + OR a = c +ORDER BY e; + +DROP TABLE t1,t2,t3; + set optimizer_switch=@innodb_icp_tmp; set storage_engine= @save_storage_engine; === modified file 'sql/item.h' --- a/sql/item.h 2012-02-15 17:08:08 +0000 +++ b/sql/item.h 2012-02-20 21:50:50 +0000 @@ -3901,6 +3901,12 @@ return example->is_expensive_processor(arg); } virtual void set_null(); + bool walk(Item_processor processor, bool walk_subquery, uchar *arg) + { + if (example && example->walk(processor, walk_subquery, arg)) + return TRUE; + return (this->*processor)(arg); + } }; _______________________________________________ commits mailing list commits(a)mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits ----- End forwarded message ----- -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Please review: Rev 3430: BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN in file:///home/psergey/dev2/5.3-look55/
by Sergei Petrunia 20 Feb '12

20 Feb '12

Hi Monty, Could you please review the below: ----- Forwarded message from Sergey Petrunya <psergey(a)askmonty.org> ----- From: Sergey Petrunya <psergey(a)askmonty.org> To: commits(a)mariadb.org X-Mailer: mail (GNU Mailutils 1.2) Date: Mon, 20 Feb 2012 20:04:54 +0400 (GST) Subject: [Commits] Rev 3430: BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN in file:///home/psergey/dev2/5.3-look55/ At file:///home/psergey/dev2/5.3-look55/ ------------------------------------------------------------ revno: 3430 revision-id: psergey(a)askmonty.org-20120220160453-jtj27fub5fxl9re4 parent: psergey(a)askmonty.org-20120220113450-0foyjou7b1h0bid6 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: 5.3-look55 timestamp: Mon 2012-02-20 20:04:53 +0400 message: BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN - In mi_rkey(), do correct handling of case where mi_yield_and_check_if_killed() detects that the thread was killed (all other similar functions in MyISAM/Aria have slightly different code and do not have this problem). - Also fixed assignment in DBUG_ASSERT. === modified file 'mysql-test/r/myisam_icp.result' --- a/mysql-test/r/myisam_icp.result 2012-02-16 06:49:10 +0000 +++ b/mysql-test/r/myisam_icp.result 2012-02-20 16:04:53 +0000 @@ -909,4 +909,98 @@ c NULL NULL SET optimizer_switch=@save_optimizer_switch; DROP TABLE t1,t2,t3,t4; +# +# BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN +# +CREATE TABLE t1 ( +b INT, +c VARCHAR(1) NOT NULL, +d DATETIME, +KEY (c, b) +) ENGINE=MyISAM; +INSERT INTO t1 ( b, d, c ) VALUES +(4,'2005-01-08 00:00:00','f'), +(1,'2004-05-20 10:45:51','c'),(2,'2006-08-11 21:33:49','e'), +(5,'2003-05-19 00:20:40','a'),(3,'2005-01-03 06:18:39','a'), +(7,'2008-11-25 18:18:14','b'),(6,'2008-11-09 15:53:46','b'), +(9,'2003-03-01 03:40:36','c'),(8,'2003-09-25 23:14:09','d'), +(0,'2007-01-17 09:18:31','f'),(9,'2008-09-08 09:52:24','c'), +(2,'2008-03-10 00:00:00','a'),(0,'2003-03-14 09:31:07','c'), +(4,'2005-04-25 00:00:00','h'),(6,'2001-08-01 05:55:55','e'), +(3,'2005-04-09 01:22:48','f'),(7,'2009-11-12 13:27:22','r'), +(0,'2009-03-28 05:05:28','h'),(15,'2005-05-16 04:35:41','f'), +(7,'2006-03-26 05:19:58','c'),(9,'2002-10-06 02:17:00','g'), +(4,'2007-01-28 03:28:20','b'),(1,'2009-04-22 10:16:40','c'), +(2,'2003-01-01 19:39:00','f'),(0,'2008-05-03 19:16:29','t'), +(2,'2005-01-28 00:00:00','j'),(8,'2004-01-10 00:00:00','w'), +(8,'2000-06-13 21:56:37','a'),(5,'2001-03-21 19:24:49','o'), +(99,'2003-12-20 21:29:06','f'),(0,'1900-01-01 00:00:00','w'), +(7,'2000-12-19 00:00:00','c'),(0,'2000-03-03 06:10:19','l'), +(3,'2000-08-11 00:00:00','q'),(0,'2007-05-25 03:46:41','e'), +(241,'2005-05-17 00:00:00','j'),(4,'2005-11-02 00:44:06','r'), +(43,'2001-07-11 00:00:00','a'),(1,'2008-12-01 18:30:27','z'), +(4,'2004-10-25 00:00:00','i'),(5,'2000-04-08 12:12:01','c'), +(0,'1900-01-01 00:00:00','f'),(9,'2002-05-13 22:47:02','p'), +(1,'2008-10-09 15:39:40','d'),(3,'2004-06-24 00:00:00','d'), +(0,'2008-03-06 00:00:00','r'),(9,'2007-04-16 18:40:03','i'), +(3,'2008-03-16 19:49:37','t'),(7,'2003-07-15 08:11:21','d'), +(8,'2005-02-11 00:04:53','r'),(0,'2002-09-21 00:00:00','y'), +(3,'2004-11-03 00:37:21','z'),(6,'2007-10-18 00:00:00','e'), +(6,'2007-01-21 10:42:56','o'),(5,'2000-03-26 21:21:04','b'), +(9,'2001-03-15 08:08:21','e'),(1,'2001-10-16 12:56:59','a'), +(6,'2004-05-01 23:45:55','o'),(4,'2000-03-04 00:00:00','f'), +(9,'2002-12-03 16:48:28','e'),(8,'2003-01-09 00:36:07','m'), +(1,'2006-06-22 04:32:41','s'),(8,'2008-09-20 05:01:48','q'), +(4,'2006-06-02 22:15:31','g'),(2,'2002-05-14 07:07:42','e'), +(7,'2005-06-05 01:30:42','r'),(127,'2004-05-11 01:56:48','a'), +(210,'2003-11-05 00:41:34','z'),(5,'1900-01-01 00:00:00','h'), +(1,'2006-04-16 00:00:00','f'),(7,'2000-12-17 00:00:00','x'), +(8,'2009-05-09 20:43:07','b'),(175,'2008-11-26 16:33:09','p'), +(0,'2002-05-09 21:18:44','v'),(8,'2002-06-01 11:32:25','k'), +(1,'2008-11-09 23:56:00','a'),(0,'2008-01-08 10:18:46','c'), +(2,'2005-04-16 00:00:00','o'),(5,'2002-08-25 00:00:00','b'), +(64,'2005-12-05 21:51:52','b'),(4,'2005-08-10 00:00:00','i'), +(6,'2006-03-23 00:00:00','d'),(9,'2007-01-27 00:00:00','i'), +(8,'2008-08-16 00:00:00','a'),(7,'2003-01-16 12:13:18','k'), +(0,'2003-06-22 00:00:00','v'),(5,'2008-06-20 05:43:56','u'), +(8,'2004-09-23 18:57:17','e'),(1,'2000-12-26 00:00:00','y'), +(4,'2009-06-01 13:00:28','e'),(1,'2009-11-18 06:28:48','m'), +(0,'2004-06-12 10:01:10','e'),(2,'2005-10-16 01:48:55','e'), +(5,'2001-12-23 09:50:21','l'),(6,'1900-01-01 00:00:00','a'), +(1,'2001-10-28 00:00:00','d'),(1,'2008-07-12 23:30:19','s'), +(0,'2002-10-11 16:51:16','r'),(4,'2007-09-18 06:27:10','x'), +(1,'2007-02-21 12:28:14','e'),(6,'2001-09-16 00:00:00','f'), +(0,'2007-09-20 02:25:45','c'),(0,'2006-08-07 03:25:56','j'), +(8,'2006-12-04 20:20:32','t'),(7,'2007-09-05 10:13:10','i'), +(9,'2006-04-12 17:59:57','t'),(2,'2009-04-28 00:06:09','b'), +(8,'2000-01-07 00:00:00','b'),(7,'2000-03-25 10:04:41','k'), +(4,'2000-07-10 00:44:55','w'),(9,'2007-09-22 14:26:26','j'), +(9,'2003-09-11 22:41:17','a'),(0,'2004-06-07 13:52:32','c'), +(8,'2008-10-09 00:00:00','p'),(1,'2007-04-01 00:00:00','c'), +(9,'2000-12-05 00:00:00','i'),(3,'1900-01-01 00:00:00','a'), +(3,'2005-12-24 21:50:54','e'),(8,'2009-07-21 19:34:55','n'), +(9,'2005-11-13 17:57:56','d'),(7,'2004-10-07 06:41:39','l'), +(1,'2004-11-20 08:05:08','u'),(3,'2005-05-25 00:00:00','r'), +(1,'2006-09-02 14:16:41','u'),(8,'2006-01-07 00:00:00','a'), +(9,'2003-04-05 00:54:20','w'),(2,'2003-12-22 00:00:00','a'), +(9,'2006-04-16 17:31:40','e'),(6,'2005-02-10 14:22:46','e'), +(7,'2004-04-27 05:54:52','p'),(1,'2005-12-07 00:00:00','t'), +(5,'2004-04-03 20:56:28','d'),(4,'2000-09-07 05:17:16','h'), +(2,'2004-08-04 16:10:42','i'),(1,'2007-03-04 00:00:00','b'), +(9,'1900-01-01 00:00:00','d'),(1,'2000-05-12 23:02:50','m'), +(2,'1900-01-01 00:00:00','l'),(1,'1900-01-01 00:00:00','k'), +(4,'2000-07-14 01:25:18','d'),(5,'2009-08-21 00:00:00','w'), +(6,'2009-05-25 13:33:54','f'),(7,'2006-06-13 00:00:00','e'), +(8,'1900-01-01 00:00:00','a'),(6,'2004-02-24 00:00:00','j'), +(0,'2003-05-21 07:03:46','k'),(9,'1900-01-01 00:00:00','e'), +(2,'1900-01-01 00:00:00','y'),(2,'2000-12-22 00:00:00','e'), +(3,'2003-09-26 00:00:00','f'),(2,'2001-01-13 08:20:19','h'), +(9,'2008-09-23 20:03:28','n'),(5,'2007-03-20 02:41:38','s'), +(1,'2009-02-14 10:27:18','a'),(0,'2001-08-10 17:44:05','s'), +(3,'2008-01-20 12:49:54','v'),(1,'2001-05-05 09:09:59','r'); +CREATE TABLE t2 ( a INT ) ENGINE=MyISAM; +INSERT INTO t2 VALUES +(7),(3),(7),(3); +# Now run a number of ICP queries while trying to kill them +DROP TABLE t1,t2; set optimizer_switch=@myisam_icp_tmp; === modified file 'mysql-test/t/myisam_icp.test' --- a/mysql-test/t/myisam_icp.test 2011-12-15 08:21:15 +0000 +++ b/mysql-test/t/myisam_icp.test 2012-02-20 16:04:53 +0000 @@ -262,4 +262,126 @@ DROP TABLE t1,t2,t3,t4; +--echo # +--echo # BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN +--echo # +CREATE TABLE t1 ( + b INT, + c VARCHAR(1) NOT NULL, + d DATETIME, + KEY (c, b) +) ENGINE=MyISAM; +INSERT INTO t1 ( b, d, c ) VALUES +(4,'2005-01-08 00:00:00','f'), +(1,'2004-05-20 10:45:51','c'),(2,'2006-08-11 21:33:49','e'), +(5,'2003-05-19 00:20:40','a'),(3,'2005-01-03 06:18:39','a'), +(7,'2008-11-25 18:18:14','b'),(6,'2008-11-09 15:53:46','b'), +(9,'2003-03-01 03:40:36','c'),(8,'2003-09-25 23:14:09','d'), +(0,'2007-01-17 09:18:31','f'),(9,'2008-09-08 09:52:24','c'), +(2,'2008-03-10 00:00:00','a'),(0,'2003-03-14 09:31:07','c'), +(4,'2005-04-25 00:00:00','h'),(6,'2001-08-01 05:55:55','e'), +(3,'2005-04-09 01:22:48','f'),(7,'2009-11-12 13:27:22','r'), +(0,'2009-03-28 05:05:28','h'),(15,'2005-05-16 04:35:41','f'), +(7,'2006-03-26 05:19:58','c'),(9,'2002-10-06 02:17:00','g'), +(4,'2007-01-28 03:28:20','b'),(1,'2009-04-22 10:16:40','c'), +(2,'2003-01-01 19:39:00','f'),(0,'2008-05-03 19:16:29','t'), +(2,'2005-01-28 00:00:00','j'),(8,'2004-01-10 00:00:00','w'), +(8,'2000-06-13 21:56:37','a'),(5,'2001-03-21 19:24:49','o'), +(99,'2003-12-20 21:29:06','f'),(0,'1900-01-01 00:00:00','w'), +(7,'2000-12-19 00:00:00','c'),(0,'2000-03-03 06:10:19','l'), +(3,'2000-08-11 00:00:00','q'),(0,'2007-05-25 03:46:41','e'), +(241,'2005-05-17 00:00:00','j'),(4,'2005-11-02 00:44:06','r'), +(43,'2001-07-11 00:00:00','a'),(1,'2008-12-01 18:30:27','z'), +(4,'2004-10-25 00:00:00','i'),(5,'2000-04-08 12:12:01','c'), +(0,'1900-01-01 00:00:00','f'),(9,'2002-05-13 22:47:02','p'), +(1,'2008-10-09 15:39:40','d'),(3,'2004-06-24 00:00:00','d'), +(0,'2008-03-06 00:00:00','r'),(9,'2007-04-16 18:40:03','i'), +(3,'2008-03-16 19:49:37','t'),(7,'2003-07-15 08:11:21','d'), +(8,'2005-02-11 00:04:53','r'),(0,'2002-09-21 00:00:00','y'), +(3,'2004-11-03 00:37:21','z'),(6,'2007-10-18 00:00:00','e'), +(6,'2007-01-21 10:42:56','o'),(5,'2000-03-26 21:21:04','b'), +(9,'2001-03-15 08:08:21','e'),(1,'2001-10-16 12:56:59','a'), +(6,'2004-05-01 23:45:55','o'),(4,'2000-03-04 00:00:00','f'), +(9,'2002-12-03 16:48:28','e'),(8,'2003-01-09 00:36:07','m'), +(1,'2006-06-22 04:32:41','s'),(8,'2008-09-20 05:01:48','q'), +(4,'2006-06-02 22:15:31','g'),(2,'2002-05-14 07:07:42','e'), +(7,'2005-06-05 01:30:42','r'),(127,'2004-05-11 01:56:48','a'), +(210,'2003-11-05 00:41:34','z'),(5,'1900-01-01 00:00:00','h'), +(1,'2006-04-16 00:00:00','f'),(7,'2000-12-17 00:00:00','x'), +(8,'2009-05-09 20:43:07','b'),(175,'2008-11-26 16:33:09','p'), +(0,'2002-05-09 21:18:44','v'),(8,'2002-06-01 11:32:25','k'), +(1,'2008-11-09 23:56:00','a'),(0,'2008-01-08 10:18:46','c'), +(2,'2005-04-16 00:00:00','o'),(5,'2002-08-25 00:00:00','b'), +(64,'2005-12-05 21:51:52','b'),(4,'2005-08-10 00:00:00','i'), +(6,'2006-03-23 00:00:00','d'),(9,'2007-01-27 00:00:00','i'), +(8,'2008-08-16 00:00:00','a'),(7,'2003-01-16 12:13:18','k'), +(0,'2003-06-22 00:00:00','v'),(5,'2008-06-20 05:43:56','u'), +(8,'2004-09-23 18:57:17','e'),(1,'2000-12-26 00:00:00','y'), +(4,'2009-06-01 13:00:28','e'),(1,'2009-11-18 06:28:48','m'), +(0,'2004-06-12 10:01:10','e'),(2,'2005-10-16 01:48:55','e'), +(5,'2001-12-23 09:50:21','l'),(6,'1900-01-01 00:00:00','a'), +(1,'2001-10-28 00:00:00','d'),(1,'2008-07-12 23:30:19','s'), +(0,'2002-10-11 16:51:16','r'),(4,'2007-09-18 06:27:10','x'), +(1,'2007-02-21 12:28:14','e'),(6,'2001-09-16 00:00:00','f'), +(0,'2007-09-20 02:25:45','c'),(0,'2006-08-07 03:25:56','j'), +(8,'2006-12-04 20:20:32','t'),(7,'2007-09-05 10:13:10','i'), +(9,'2006-04-12 17:59:57','t'),(2,'2009-04-28 00:06:09','b'), +(8,'2000-01-07 00:00:00','b'),(7,'2000-03-25 10:04:41','k'), +(4,'2000-07-10 00:44:55','w'),(9,'2007-09-22 14:26:26','j'), +(9,'2003-09-11 22:41:17','a'),(0,'2004-06-07 13:52:32','c'), +(8,'2008-10-09 00:00:00','p'),(1,'2007-04-01 00:00:00','c'), +(9,'2000-12-05 00:00:00','i'),(3,'1900-01-01 00:00:00','a'), +(3,'2005-12-24 21:50:54','e'),(8,'2009-07-21 19:34:55','n'), +(9,'2005-11-13 17:57:56','d'),(7,'2004-10-07 06:41:39','l'), +(1,'2004-11-20 08:05:08','u'),(3,'2005-05-25 00:00:00','r'), +(1,'2006-09-02 14:16:41','u'),(8,'2006-01-07 00:00:00','a'), +(9,'2003-04-05 00:54:20','w'),(2,'2003-12-22 00:00:00','a'), +(9,'2006-04-16 17:31:40','e'),(6,'2005-02-10 14:22:46','e'), +(7,'2004-04-27 05:54:52','p'),(1,'2005-12-07 00:00:00','t'), +(5,'2004-04-03 20:56:28','d'),(4,'2000-09-07 05:17:16','h'), +(2,'2004-08-04 16:10:42','i'),(1,'2007-03-04 00:00:00','b'), +(9,'1900-01-01 00:00:00','d'),(1,'2000-05-12 23:02:50','m'), +(2,'1900-01-01 00:00:00','l'),(1,'1900-01-01 00:00:00','k'), +(4,'2000-07-14 01:25:18','d'),(5,'2009-08-21 00:00:00','w'), +(6,'2009-05-25 13:33:54','f'),(7,'2006-06-13 00:00:00','e'), +(8,'1900-01-01 00:00:00','a'),(6,'2004-02-24 00:00:00','j'), +(0,'2003-05-21 07:03:46','k'),(9,'1900-01-01 00:00:00','e'), +(2,'1900-01-01 00:00:00','y'),(2,'2000-12-22 00:00:00','e'), +(3,'2003-09-26 00:00:00','f'),(2,'2001-01-13 08:20:19','h'), +(9,'2008-09-23 20:03:28','n'),(5,'2007-03-20 02:41:38','s'), +(1,'2009-02-14 10:27:18','a'),(0,'2001-08-10 17:44:05','s'), +(3,'2008-01-20 12:49:54','v'),(1,'2001-05-05 09:09:59','r'); + +CREATE TABLE t2 ( a INT ) ENGINE=MyISAM; +INSERT INTO t2 VALUES + (7),(3),(7),(3); + +--let $run = 300 +--let $con_id = `SELECT CONNECTION_ID()` + +--echo # Now run a number of ICP queries while trying to kill them +--disable_query_log +--disable_result_log +while ($run) +{ + --send + SELECT * FROM t1 AS alias1 STRAIGHT_JOIN t1 AS alias2 + ON alias2.c = alias1.c + WHERE alias2.b >= 9; + + --connect (con1,127.0.0.1,root,,test) + --eval KILL QUERY $con_id + --disconnect con1 + + --dec $run + + --connection default + --error 0,ER_QUERY_INTERRUPTED + --reap +} +--enable_result_log +--enable_query_log +DROP TABLE t1,t2; + set optimizer_switch=@myisam_icp_tmp; + === modified file 'storage/myisam/mi_rkey.c' --- a/storage/myisam/mi_rkey.c 2011-02-18 19:45:32 +0000 +++ b/storage/myisam/mi_rkey.c 2012-02-20 16:04:53 +0000 @@ -157,7 +157,11 @@ mi_yield_and_check_if_killed(info, inx)) { /* Aborted by user */ + DBUG_ASSERT(info->lastpos == HA_OFFSET_ERROR && + my_errno == HA_ERR_ABORTED_BY_USER); + res= ICP_ERROR; buf= 0; /* Fast abort */ + break; } } if (res == ICP_OUT_OF_RANGE) @@ -179,7 +183,7 @@ } else { - DBUG_ASSERT(info->lastpos= HA_OFFSET_ERROR); + DBUG_ASSERT(info->lastpos == HA_OFFSET_ERROR); } } if (share->concurrent_insert) _______________________________________________ commits mailing list commits(a)mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits ----- End forwarded message ----- -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Fwd: [Commits] Rev 3335: Fix bug lp:825075 in file:///home/tsk/mprog/src/5.3/
by Sergei Petrunia 17 Feb '12

17 Feb '12

Hi Timour, Feedback follows skype discussion: First, here's a general comment Consider a query: SELECT b, min(a) FROM t1 GROUP BY b; Suppose there is an index (b,a). Loose scan would execute it as follows: S00 h->index_first(); S01 produce an output record of (b, a) // first value of 'a' is the minimum S02 S03 h->read_next_different_b(); // Jump to the next GROUP-BY group. S04 ... S05 If we modify the query by adding a WHERE: SELECT b, min(a) FROM t1 WHERE arbitrary_cond(a,b) GROUP BY b; then LooseScan (in its current form) will be unable to execute it. The problem is here: S00 h->index_first(); S01 produce an output record of (b, a) // first value of 'a' is the minimum ^^^ what if this record doesn't match the WHERE? We'll have to scan further within the record having b=first_record.b until we find a match. LooseScan executor doesn't support such "walk forward" action currently. If the WHERE clause has been converted into a range, such that there are no records that would be contained in the range but not match the WHERE clause (***) then LooseScan is able to handle it. Example: SELECT b, min(a) FROM t1 WHERE a>10 GROUP BY b; Execution would proceed as follows: S00 h->index_first(); S00 h->index_read(HA_READ_AFTER_KEY, {current_row.b, 'a>10'}) S01 produce an output record of (b, a) // first value of 'a>10' is the minimum Step S01 will produce correct results as long as the following holds: "The first record we've got in a range will satisfy the WHERE condition" This is not always the case. Here's a counterexample: SELECT b, min(a) FROM t1 WHERE a>10 GROUP BY b; SELECT b, min(a) FROM t1 WHERE a>10 and ((a MOD 2) = 0) GROUP BY b; -- (C1) Consider the second query and this dataset: b , a 1, 5 1, 7 1, 11 1, 13 1, 14 range optimizer would give a range of "a > 10", and the first matching record is (1,11). It doesn't satisfy the "(a MOD 2)=0" condition, neither does the next record of (1,13), and only the record (1,14) will satisfy the MOD part of the condition. The problem: current code doesn't seem to have the logic to detect such cases. The submitted patch disables LooseScan for apparently invalid cases where the WHERE condition covers a column while range condition does not, which means that condition (***) is certainly unmet. However, cases like (C1) are still not handled. Further comments are inline. On Wed, Dec 07, 2011 at 02:18:02PM +0200, Timour Katchaounov wrote: > Could you please review the below patch. > > Timour > > ----------------------------------------------------------- > revno: 3335 > revision-id: timour(a)askmonty.org-20111207115332-3oa536gbt20r22po > parent: igor(a)askmonty.org-20111206214218-lev0vyidyt8h3431 > fixes bug(s): https://launchpad.net/bugs/825075 > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Wed 2011-12-07 13:53:32 +0200 > message: > Fix bug lp:825075 > > Analys: > The cause for the wrong result was that the optimizer > incorrectly chose min/max loose scan when it is not > applicable. The applicability test missed the case when > a condition on the MIN/MAX argument was OR-ed with a > condition on some other field. In this case, the MIN/MAX > condition cannot be used for loose scan. > > Solution: > The function check_group_min_max_predicates() duplicated > functionality performed by the range optimizer, but this > duplication was incomplete. The solution is to reuse instead > the analys and the ranges produced by the range optimizer. > If a suitable range could not be extracted for the MIN/MAX > argument, then loose scan is not applicable. > === modified file 'mysql-test/r/group_min_max.result' > --- a/mysql-test/r/group_min_max.result 2011-12-04 21:31:42 +0000 > +++ b/mysql-test/r/group_min_max.result 2011-12-07 11:53:32 +0000 > @@ -2103,7 +2103,7 @@ id select_type table type possible_keys > explain select a1,a2,b,min(c),max(c) from t2 > where (c > 'a000') and (c <= 'd999') and (c like '_8__') group by a1,a2,b; > id select_type table type possible_keys key key_len ref rows Extra > -1 SIMPLE t2 index NULL idx_t2_1 163 NULL 164 Using where; Using index > +1 SIMPLE t2 range NULL idx_t2_1 163 NULL 33 Using where; Using index for group-by > explain select a1, a2, b, c, min(d), max(d) from t1 group by a1,a2,b,c; > id select_type table type possible_keys key key_len ref rows Extra > 1 SIMPLE t1 ALL NULL NULL NULL NULL 128 Using temporary; Using filesort Why there is no testcase from the bug report? I think it's better to have a testcase that - will explicitly mention BUG# - will show the wrong query result. A changed EXPLAIN in some irrelevant test is a too poor coverage. > === modified file 'sql/opt_range.cc' > --- a/sql/opt_range.cc 2011-11-18 17:35:51 +0000 > +++ b/sql/opt_range.cc 2011-12-07 11:53:32 +0000 > @@ -11984,164 +11996,41 @@ get_best_group_min_max(PARAM *param, SEL > } > > > -/* > - Check that the MIN/MAX attribute participates only in range predicates > - with constants. > - > - SYNOPSIS > - check_group_min_max_predicates() > - cond tree (or subtree) describing all or part of the WHERE > - clause being analyzed > - min_max_arg_item the field referenced by the MIN/MAX function(s) > - min_max_arg_part the keypart of the MIN/MAX argument if any > - > - DESCRIPTION > - The function walks recursively over the cond tree representing a WHERE > - clause, and checks condition (SA3) - if a field is referenced by a MIN/MAX > - aggregate function, it is referenced only by one of the following > - predicates: {=, !=, <, <=, >, >=, between, is null, is not null}. > +/** > + Find the range tree for the field that is an argument of MIN/MAX. > > - RETURN > - TRUE if cond passes the test > - FALSE o/w > + @param cond The WHERE clause of the query > + @param min_max_arg_item The field referenced by the MIN/MAX function(s) > + @param index_tree Range tree for the chosen index > + > + @note > + The function iterates over the range trees for each keypart of the > + chosen index until it finds the range for the MIN/MAX keypart. > + > + @retval > + If there is a range for the MIN/MAX argument > + @retval > + NULL if there is no range > */ > > -static bool > -check_group_min_max_predicates(Item *cond, Item_field *min_max_arg_item, > - Field::imagetype image_type) > +static SEL_ARG * > +get_min_max_range(Item *cond, Item_field *min_max_arg_item, SEL_ARG *index_tree) > { > - DBUG_ENTER("check_group_min_max_predicates"); > - DBUG_ASSERT(cond && min_max_arg_item); > - > + if (!cond || !min_max_arg_item) > + return NULL; > cond= cond->real_item(); So we've got: get_min_max_range(Item *cond, Item_field *min_max_arg_item, SEL_ARG *index_tree) { if (!cond || !min_max_arg_item) return NULL; cond= cond->real_item(); 'cond' is passed as parameter, checked, modified, and .. then never used in the function. Please fix this. > - Item::Type cond_type= cond->real_type(); > - if (cond_type == Item::COND_ITEM) /* 'AND' or 'OR' */ > - { > - DBUG_PRINT("info", ("Analyzing: %s", ((Item_func*) cond)->func_name())); > - List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list()); > - Item *and_or_arg; > - while ((and_or_arg= li++)) > - { > - if (!check_group_min_max_predicates(and_or_arg, min_max_arg_item, > - image_type)) > - DBUG_RETURN(FALSE); > - } > - DBUG_RETURN(TRUE); > - } > - > - /* > - Disallow loose index scan if the MIN/MAX argument field is referenced by > - a subquery in the WHERE clause. > - */ > - > - if (cond_type == Item::SUBSELECT_ITEM) > - { > - Item_subselect *subs_cond= (Item_subselect*) cond; > - if (subs_cond->is_correlated) > - { > - DBUG_ASSERT(subs_cond->upper_refs.elements > 0); > - List_iterator_fast<Item_subselect::Ref_to_outside> > - li(subs_cond->upper_refs); > - Item_subselect::Ref_to_outside *dep; > - while ((dep= li++)) > - { > - if (dep->item->eq(min_max_arg_item, FALSE)) > - DBUG_RETURN(FALSE); > - } > - } > - DBUG_RETURN(TRUE); > - } > - > /* > - Condition of the form 'field' is equivalent to 'field <> 0' and thus > - satisfies the SA3 condition. > + Extract the SEL_ARG subtree that contains only ranges for the MIN/MAX > + attribute. > */ > - if (cond_type == Item::FIELD_ITEM) > + SEL_ARG *min_max_range= index_tree; > + while (min_max_range) /* Find the tree for the MIN/MAX key part. */ > { > - DBUG_PRINT("info", ("Analyzing: %s", cond->full_name())); > - DBUG_RETURN(TRUE); > - } > - > - /* We presume that at this point there are no other Items than functions. */ > - DBUG_ASSERT(cond_type == Item::FUNC_ITEM); > - > - /* Test if cond references only group-by or non-group fields. */ > - Item_func *pred= (Item_func*) cond; > - Item **arguments= pred->arguments(); > - Item *cur_arg; > - DBUG_PRINT("info", ("Analyzing: %s", pred->func_name())); > - for (uint arg_idx= 0; arg_idx < pred->argument_count (); arg_idx++) > - { > - cur_arg= arguments[arg_idx]->real_item(); > - DBUG_PRINT("info", ("cur_arg: %s", cur_arg->full_name())); > - if (cur_arg->type() == Item::FIELD_ITEM) > - { > - if (min_max_arg_item->eq(cur_arg, 1)) > - { > - /* > - If pred references the MIN/MAX argument, check whether pred is a range > - condition that compares the MIN/MAX argument with a constant. > - */ > - Item_func::Functype pred_type= pred->functype(); > - if (pred_type != Item_func::EQUAL_FUNC && > - pred_type != Item_func::LT_FUNC && > - pred_type != Item_func::LE_FUNC && > - pred_type != Item_func::GT_FUNC && > - pred_type != Item_func::GE_FUNC && > - pred_type != Item_func::BETWEEN && > - pred_type != Item_func::ISNULL_FUNC && > - pred_type != Item_func::ISNOTNULL_FUNC && > - pred_type != Item_func::EQ_FUNC && > - pred_type != Item_func::NE_FUNC) > - DBUG_RETURN(FALSE); > - > - /* Check that pred compares min_max_arg_item with a constant. */ > - Item *args[3]; > - bzero(args, 3 * sizeof(Item*)); > - bool inv; > - /* Test if this is a comparison of a field and a constant. */ > - if (!simple_pred(pred, args, &inv)) > - DBUG_RETURN(FALSE); > - > - /* Check for compatible string comparisons - similar to get_mm_leaf. */ > - if (args[0] && args[1] && !args[2] && // this is a binary function > - min_max_arg_item->result_type() == STRING_RESULT && > - /* > - Don't use an index when comparing strings of different collations. > - */ > - ((args[1]->result_type() == STRING_RESULT && > - image_type == Field::itRAW && > - ((Field_str*) min_max_arg_item->field)->charset() != > - pred->compare_collation()) > - || > - /* > - We can't always use indexes when comparing a string index to a > - number. > - */ > - (args[1]->result_type() != STRING_RESULT && > - min_max_arg_item->field->cmp_type() != args[1]->result_type()))) > - DBUG_RETURN(FALSE); > - } > - } > - else if (cur_arg->type() == Item::FUNC_ITEM) > - { > - if (!check_group_min_max_predicates(cur_arg, min_max_arg_item, > - image_type)) > - DBUG_RETURN(FALSE); > - } > - else if (cur_arg->const_item()) > - { > - /* > - For predicates of the form "const OP expr" we also have to check 'expr' > - to make a decision. > - */ > - continue; > - } > - else > - DBUG_RETURN(FALSE); > + if (min_max_range->field->eq(min_max_arg_item->field)) > + break; > + min_max_range= min_max_range->next_key_part; > } > - > - DBUG_RETURN(TRUE); > + return min_max_range; > } > > BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 2

[Maria-developers] MariaDB 5.3.4 release status
by Sergei Petrunia 15 Feb '12

15 Feb '12

Hi, I've pushed the last bug fix slated for MariaDB 5.3.4, so revno:3419 has a chance to become the 5.3.4 release. It is currently building in buildbot. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 7

Re: [Maria-developers] [Commits] Rev 3421: Counters for Index Condition Pushdown added (MDEV-130). in file:///home/bell/maria/bzr/work-maria-5.3-MDEV-130/
by Sergei Petrunia 15 Feb '12

15 Feb '12

Hi Sanja, On Wed, Feb 15, 2012 at 04:13:54PM +0200, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-MDEV-130/ > > ------------------------------------------------------------ > revno: 3421 > revision-id: sanja(a)montyprogram.com-20120215141351-rk4pi025utdztzt8 > parent: holyfoot(a)askmonty.org-20120214120406-02q2mv2t6xb37dno > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.3-MDEV-130 > timestamp: Wed 2012-02-15 16:13:51 +0200 > message: > Counters for Index Condition Pushdown added (MDEV-130). OK to push. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Failure in plugins.feedback_plugin_send
by Kristian Nielsen 14 Feb '12

14 Feb '12

Hi Serg, 5.5 Buildbot is getting greener, but there are still a couple of random failures left. One of them is in plugins.feedback_plugin_send: ----------------------------------------------------------------------- plugins.feedback_plugin_send w1 [ fail ] Test ended at 2012-02-12 00:41:06 CURRENT_TEST: plugins.feedback_plugin_send --- /home/buildbot/build/mysql-test/suite/plugins/r/feedback_plugin_send.result 2012-02-11 21:14:54.336622000 +0200 +++ /home/buildbot/build/mysql-test/suite/plugins/r/feedback_plugin_send.reject 2012-02-12 00:41:05.785412054 +0200 @@ -9,7 +9,4 @@ FEEDBACK_SEND_TIMEOUT 60 FEEDBACK_URL http://mariadb.org/feedback_plugin/post FEEDBACK_USER_INFO mysql-test -feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent -feedback plugin: server replied 'ok' -feedback plugin: report to 'http://mariadb.org/feedback_plugin/post' was sent -feedback plugin: server replied 'ok' +feedback plugin: failed to send report to 'http://mariadb.org/feedback_plugin/post' mysqltest: Result length mismatch ----------------------------------------------------------------------- Any ideas? The test has been failing for a while, though rarely (but maybe some of the past failures have been fixed): http://buildbot.askmonty.org/buildbot/reports/cross_reference#branch=&revis… - Kristian.

2 1

[Maria-developers] Please try new fulltext storage engine "mroonga"
by Kazuhiko Shiozaki 07 Feb '12

07 Feb '12

Hello ! I would like to introduce a new fulltext storage engine "mroonga", that will be included in the future MariaDB release. Mroonga is a fulltext storage engine having the following characteristics: * CJK ready fulltext search * no read lock * faster than MyISAM for both indexing and searching * geolocalazation search is also supported Current development branch is : https://code.launchpad.net/~maria-captains/maria/mariadb-5.3-monty Further information about mroonga can be found : https://kb.askmonty.org/en/about-mroonga You can also see some presentations : http://mroonga.github.com/publication/ I sincerely ask you to try mroonga, at least compile and run tests, on various platforms, like the following procedure. (get source tree) $ ./BUILD/compile-pentium-max (wait for a while) $ cd mysql-test $ ./mtr --suite=mroonga_storage,mroonga_wrapper --force If you find any problem like compilation error, test failure, or whatever, please let me know. Thanks in advance ! -- Kazuhiko Shiozaki, Nexedi SA Senior Consultant Nexedi: Consulting and Development of Free / Open Source Software http://www.nexedi.co.jp/ ERP5: Full Featured High End Open Source ERP http://www.erp5.com/

1 0

[Maria-developers] New KB Question: SSL with other Clients than the original MariaDB-client?
by Daniel Bartholomew 03 Feb '12

03 Feb '12

A new question has been posted to the Knowledgebase. http://kb.askmonty.org/en/ssl-with-other-clients-than-the-original-mariadb-… ==================== It seems to be that there is a difference in handling the SSL handshake at the MariaDB-Server (5.2 or below) in contrast to the Mysql-Server 5.1. All JDBC-Clients can sucessfully connect to the Mysql-Server 5.1 via SSL, but with MariaDB-Server not. Without SSL all JDBC-Clients can sucessfully connect to MariaDB. Both server run with the same CA-, Server- and Client-Certificates and I have made the following tests (all with MariaDB Server 5.2.10 and also tested with 5.1.60 from the Deb-Repository): * Mysql-Client (5.1) cannot connect to MariaDB Server: "ERROR 2026 (HY000): SSL connection error" * Mysql-connector/J cannot connect to MariaDB Server: TLSv1 Handshake fails with "unexpected message" after ClientHello * Drizzle JDBC cannot connect to MariaDB-Server: TLSv1 Handshake fails also with "unexpected message" after ClientHello * Original MariaDB-Client (5.2) can connect easily via SSL with the CA-Certificate to MariaDB-Server. It seems to be a general communication problem in the SSL-Handshake after ClientHello. Is it a bug or a feature? Debug-Log of Java: <<fixed>> trigger seeding of SecureRandom done seeding SecureRandom Allow unsafe renegotiation: false Allow legacy hello messages: true Is initial handshake: true Is secure renegotiation: false %% No cached client session ClientHello, TLSv1 RandomCookie: GMT: 1328138424 bytes Session ID: {} Cipher Suites: [SSL_RSA_WITH_RC4_128_MD5, SSL_RSA_WITH_RC4_128_SHA, \\TLS_RSA_WITH_AES_128_CBC_SHA, TLS_DHE_RSA_WITH_AES_128_CBC_SHA, \\TLS_DHE_DSS_WITH_AES_128_CBC_SHA, SSL_RSA_WITH_3DES_EDE_CBC_SHA, \\SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, \\SSL_RSA_WITH_DES_CBC_SHA, SSL_DHE_RSA_WITH_DES_CBC_SHA, \\ SSL_DHE_DSS_WITH_DES_CBC_SHA, SSL_RSA_EXPORT_WITH_RC4_40_MD5, \\SSL_RSA_EXPORT_WITH_DES40_CBC_SHA, SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA, \\SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA, TLS_EMPTY_RENEGOTIATION_INFO_SCSV] \\ Compression Methods: { 0 } \\ [write] MD5 and SHA1 hashes: len = 75 \\ main, WRITE: TLSv1 Handshake, length = 75 \\ [Raw write]: length = 80 \\ [Raw read]: length = 5 \\ 0000: 16 00 00 02 FF .....\\ main, handling exception: javax.net.ssl.SSLException: Unsupported record version Unknown-0.0\\ main, SEND TLSv1 ALERT: fatal, description = unexpected_message\\ main, WRITE: TLSv1 Alert, length = 2\\ <</fixed>> ==================== Thanks! -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] New KB Question: How can I install the pam_authentication plugin in deb based system?
by Daniel Bartholomew 01 Feb '12

01 Feb '12

A new question has been posted in the Knowledgebase: How can I install the pam_authentication plugin in deb based system? http://kb.askmonty.org/en/how-can-i-install-the-pam_authentication-plugin-i… ========== Hi all, I've been reading the pam_auth plugin howto: https://kb.askmonty.org/en/pam-authentication-plugin MariaDB [test]> INSTALL PLUGIN pam SONAME 'auth_pam.so'; ERROR 1126 (HY000): Can't open shared library '/usr/lib/mysql/plugin/auth_pam.so' (errno: 2 cannot open shared object file: No such file or directory) Indeed that file does not exist on the system. Nor does the pam_mariadb_mtr.so file. I installed mariadb-server-5.2 using the deb repos on Ubuntu 10.04 64bit (Lucid). Is there any deb archive to include those files in binary? Or do I have to resort to source compilation? ========== Thanks! -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] Preparing to release MariaDB 5.3.4-rc
by Daniel Bartholomew 31 Jan '12

31 Jan '12

All, Monty has informed me that we are ready to release MariaDB 5.3.4-rc. I'm uploading the packages to the primary mirror now and if all goes well the general release announcement will go out tomorrow morning (my time). The source tree has not been tagged yet but the release is from revision 3402: http://bazaar.launchpad.net/~maria-captains/maria/5.3/changes To all the devs: If there is anything notable which I should make sure to include in the release notes, please let me know ASAP. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] Is our annotate_rows_log_event same as mysql-5.6's?
by Kristian Nielsen 31 Jan '12

31 Jan '12

Sergei Petrunia <psergey(a)askmonty.org> writes: > Also, it seems that right now binary logs are not compatible between mysql-5.6 > and mariadb-5.3. When I try read one file with mysqlbinlog of the other I get > this: > > > mariadb-5.3 reading binlog from mysql-5.6 > #120131 2:43:14 server id 1 end_log_pos 295 Query thread_id=2 exec_time=0 error_code=0 > SET TIMESTAMP=1327963394/*!*/; > BEGIN > /*!*/; > ERROR: Error in Log_event::read_log_event(): 'Found invalid event in binary log', data_len: 62, event_type: 29 > ERROR: Could not read entry at offset 295: Error in log format or read error. Yes, 29 is ROWS_QUERY_LOG_EVENT, their version of annotate_rows_log_event. I think you will find the same problem if you try to read with MySQL 5.1 or 5.5. I believe this only happens if you enable row annotation events on the master; it seems a general thing that if one enables a new feature on a MySQL master, it breaks old slaves. However, when we merge 5.6, we get the new IGNORABLE_LOG_EVENT flag, which allows a newer master (eg. 5.7) to inform an old slave that it is ok to ignore a specific event. When we merge 5.6, I suppose we will just make sure MariaDB 5.6 writes the MySQL event code on the master, and understands the MariaDB event code on the slave, so this will be solved. > Mysql 5.6 reading mariadb-5.3 > ERROR: Error in Log_event::read_log_event(): 'Found invalid event in binary log', data_len: 48, event_type: -96 > ERROR: Could not read entry at offset 503: Error in log format or read error. > # at 434 > #120131 2:01:47 server id 1 end_log_pos 503 Query thread_id=1 exec_time=0 error_code=0 > SET TIMESTAMP=1327960907/*!*/; > BEGIN And this is the reverse situation, -96 is our ANNOTATE_ROWS_EVENT, which is not understood by MySQL. Again, this only happens when row annotation is explicitly enabled on the master, so one should not do this when having old slaves connected (whether MySQL or MariaDB). There is a deeper issue here. It is not possible on the master to simply filter out the events that an old slave does not understand, as would seem natural. Because the current slave code gets confused when there are "holes" in the binlog positions it receives from the master. In MariaDB 5.5 this will be fixed (if I'm allowed to push MWL#234 ...), allowing a MariaDB slave to adjust binlog positions correctly if the master filters out events. But this does not help MySQL slaves of course. Also, global transaction IDs, which MySQL@Oracle says they are working on, should fix this, but this is not in 5.6 currently. Thanks for taking up these subjects, it's good to get them more clearly understood! - Kristian.

1 0

Re: [Maria-developers] Is our annotate_rows_log_event same as mysql-5.6's?
by Kristian Nielsen 31 Jan '12

31 Jan '12

Sergei Petrunia <psergey(a)askmonty.org> writes: > I see MySQL have added an analog ours > http://kb.askmonty.org/en/annotate_rows_log_event > > http://dev.mysql.com/doc/refman/5.6/en/replication-options-binary-log.html#… > > The names of the options are different: binlog_annotate_row_events vs. binlog_rows_query_log_events > Questions (I assume you can answer them off the top of the head, if not, let's > first discuss it) > > - Is it true that they have re-implemented the feature after we did? Yes. > - Do I understand correctly that the features are not compatible? (different > event code) Yes. However, I checked the MySQL version some time ago. It is extremely similar to our version. I believe it will be quite feasible when merging to make them compatible, eg. just translate the event code from one to the other. Maybe we will just merge the MySQL version for compatibility (MySQL developers do not seem to care about compatibility themselves), and then just add backwards and forwards compatibility translation so we work with old versions of MariaDB. > - Do these features do the same thing or one is better than the other in some > respect? As I remember, they are essentially identical. - Kristian.

1 0

[Maria-developers] alternative for Field_timestamp::get_timestamp etc. ?
by Kazuhiko 30 Jan '12

30 Jan '12

Hello, I tried to build mroonga-1.3.0 ( http://mroonga.github.com/ ) with MariaDB 5.3.3 and got the following error: > g++ -DHAVE_CONFIG_H -I. -I/opt/mariadb__compile__/mariadb-5.3.3-rc/sql -I/opt/mariadb__compile__/mariadb-5.3.3-rc/include -I/opt/mariadb__compile__/mariadb-5.3.3-rc/regex -I/opt/mariadb__compile__/mariadb-5.3.3-rc -I/opt/mariadb/include/mysql -I/opt/groonga/include/groonga -I/opt/groonga/include/groonga -I/opt/mariadb/include/mysql -g -DUNIV_LINUX -g -O2 -Wall -Wextra -Wno-unused-parameter -Wno-strict-aliasing -Werror -fno-implicit-templates -fno-exceptions -fno-rtti -felide-constructors -MT libmroonga_a-ha_mroonga.o -MD -MP -MF .deps/libmroonga_a-ha_mroonga.Tpo -c -o libmroonga_a-ha_mroonga.o `test -f 'ha_mroonga.cc' || echo './'`ha_mroonga.cc > ha_mroonga.cc: In member function ‘int ha_mroonga::generic_store_bulk_timestamp(Field*, grn_obj*)’: > ha_mroonga.cc:6935:63: error: no matching function for call to ‘Field_timestamp::get_timestamp(my_bool*)’ > ha_mroonga.cc:6935:63: note: candidate is: > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:1221:21: note: virtual my_time_t Field_timestamp::get_timestamp(ulong*) const > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:1221:21: note: no known conversion for argument 1 from ‘my_bool* {aka char*}’ to ‘ulong* {aka long unsigned int*}’ > ha_mroonga.cc: In member function ‘void ha_mroonga::storage_store_field_timestamp(Field*, const char*, uint)’: > ha_mroonga.cc:7234:20: error: ‘class Field_timestamp’ has no member named ‘store_timestamp’ > ha_mroonga.cc: In member function ‘void ha_mroonga::storage_store_field_datetime(Field*, const char*, uint)’: > ha_mroonga.cc:7286:67: error: no matching function for call to ‘Field_datetime::store_time(MYSQL_TIME*, enum_mysql_timestamp_type)’ > ha_mroonga.cc:7286:67: note: candidate is: > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:209:7: note: int Field::store_time(MYSQL_TIME*) > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:209:7: note: candidate expects 1 argument, 2 provided > ha_mroonga.cc: In member function ‘void ha_mroonga::storage_store_field_new_date(Field*, const char*, uint)’: > ha_mroonga.cc:7306:62: error: no matching function for call to ‘Field_newdate::store_time(MYSQL_TIME*, enum_mysql_timestamp_type)’ > ha_mroonga.cc:7306:62: note: candidate is: > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:209:7: note: int Field::store_time(MYSQL_TIME*) > /opt/mariadb__compile__/mariadb-5.3.3-rc/sql/field.h:209:7: note: candidate expects 1 argument, 2 provided > make[2]: *** [libmroonga_a-ha_mroonga.o] Error 1 (you can see the code at https://github.com/mroonga/mroonga/blob/master/ha_mroonga.cc ) At a glance, sql/field.h seems much different from MySQL-5.1's one. What can be the alternative for the followings ? * Field_timestamp::get_timestamp(my_bool*) * Field_datetime::store_time(MYSQL_TIME*, enum_mysql_timestamp_type) * Field_newdate::store_time(MYSQL_TIME*, enum_mysql_timestamp_type) Thanks in advance. Kazuhiko

2 2

Re: [Maria-developers] [Commits] Rev 3398: Make testcase stable by adding --sorted_result for SHOW STATUS commands. in file:///home/psergey/dev2/5.3-look48/
by Sergei Golubchik 28 Jan '12

28 Jan '12

Hi, Sergey! What do you mean? SHOW STATUS returns a sorted list of variables. On Jan 27, Sergey Petrunya wrote: > At file:///home/psergey/dev2/5.3-look48/ > > revno: 3398 > revision-id: psergey(a)askmonty.org-20120127135140-4ues2tk6juf4iynx > parent: psergey(a)askmonty.org-20120126102034-tp33uzyuqnyk30mn > committer: Sergey Petrunya <psergey(a)askmonty.org> > branch nick: 5.3-look48 > timestamp: Fri 2012-01-27 17:51:40 +0400 > message: > Make testcase stable by adding --sorted_result for SHOW STATUS commands. Regards, Sergei

2 2

Re: [Maria-developers] [Commits] Rev 3241: Xtradb recently started to access thd members directly , e.g thd->stmt_da (ha_innodb.cc) in file:///H:/bzr/5.5/
by Kristian Nielsen 27 Jan '12

27 Jan '12

Vladislav Vaintroub <wlad(a)montyprogram.com> writes: > Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha_innodb.cc) > It needs recompilation for embedded server, as layout of THD is different in embedded. Did you consider instead fixing XtraDB to not access thd members directly? Eg. using proper accessors, maybe adding new accessors if needed? Or is this not possible for some reason? It would be much preferable if XtraDB didn't mess with server internals like this ... - Kristian.

3 2

[Maria-developers] mysql_client_test
by Kristian Nielsen 25 Jan '12

25 Jan '12

Just to finish our discussions on IRC... I found that mysql_client_test.test runs fine without any --plugin-dir=xxx option at all for mysql_client_test. The reason is that the correct option is in the my.cnf that we generate. So I decided to just remove the --plugin-dir option from the command line in mysql_client_test.test; this seems to work both when tested from source dir and when testing installed server. - Kristian.

1 0

[Maria-developers] Need help re. which files to include in 5.5 .debs
by Kristian Nielsen 25 Jan '12

25 Jan '12

Hi Serg, As you suggested, I compared .deb file contents with what `make install` produces in 5.5. I discovered that the following files are missing from .debs. I need help understanding which of these should be added to the .debs. (I think anything added should be to package libmariadbclient-dev): /usr/lib/libmysqlservices.a /usr/include/mysql.h /usr/include/mysql_com.h /usr/include/mysqld_ername.h /usr/include/mysqld_error.h /usr/include/mysql_embed.h /usr/include/mysql/psi /usr/include/mysql/psi/mysql_file.h /usr/include/mysql/psi/mysql_thread.h /usr/include/mysql/psi/psi_abi_v1.h /usr/include/mysql/psi/psi_abi_v2.h /usr/include/mysql/psi/psi.h /usr/include/client_plugin.h /usr/include/decimal.h /usr/include/errmsg.h /usr/include/keycache.h /usr/include/m_ctype.h /usr/include/m_string.h /usr/include/my_alloc.h /usr/include/my_attribute.h /usr/include/my_compiler.h /usr/include/my_dbug.h /usr/include/my_getopt.h /usr/include/my_global.h /usr/include/my_list.h /usr/include/my_net.h /usr/include/my_pthread.h /usr/include/mysql_time.h /usr/include/mysql_version.h /usr/include/my_sys.h /usr/include/my_valgrind.h /usr/include/my_xml.h /usr/include/plugin_audit.h /usr/include/plugin_auth.h /usr/include/plugin_ftparser.h /usr/include/plugin.h /usr/include/sql_common.h /usr/include/sql_state.h /usr/include/sslopt-case.h /usr/include/sslopt-longopts.h /usr/include/sslopt-vars.h /usr/include/typelib.h It seems pretty obvious that "mysql.h" is needed. But should I add _all_ the .h files? And what about libmysqlservices.a? - Kristian.

2 5

Re: [Maria-developers] something better than PMP
by Kristian Nielsen 25 Jan '12

25 Jan '12

Arun Sharma <asharma(a)fb.com> writes: > On 1/21/12 7:24 AM, Mark Callaghan wrote: >> 1 millisecond per thread would be much better than what we experience >> today. >> > > Is there a reason why latency per-thread is more interesting than the > absolute number? You are right of course - the interesting number is the time we spent with the target mysqld process suspended (stalled) under ptrace(). The reason I think in terms of latency-per-thread is this: Different mysqld instances can have widely different number of threads - from a few handful to perhaps thousands. Since we loop over threads while the process is ptrace()-suspended, it seems a nice measure to estimate the cost independent of number of threads in the process. >>> Arun: What I've done so far is mostly to cache reads of the same word, and >>> delay name resolve to after the target process is resumed. I think it can >>> be >>> made even faster by reading target process memory through /proc/PID/mem >>> instead of ptrace and if we can reduce repeated reads of /proc/PID/maps >>> and >>> such. > > Sounds like a good optimization to have. There is already a cache > internal to libunwind that maps a given IP address to it's unwind > info. If the repeated reads come from that code path, tweaking the > cache size might be a simpler fix. Ok, that sounds cool! - Kristian.

1 0

Re: [Maria-developers] [Commits] Rev 3129: remove few hard-coded checks from mtr in http://bazaar.launchpad.net/~maria-captains/maria/5.1/
by Kristian Nielsen 25 Jan '12

25 Jan '12

<serg(a)askmonty.org> writes: > At http://bazaar.launchpad.net/~maria-captains/maria/5.1/ > > ------------------------------------------------------------ > revno: 3129 > revision-id: sergii(a)pisem.net-20120124140839-iziwgt30gaalsiw9 > parent: sergii(a)pisem.net-20120124125357-b3o68crdtg2w3fzj > committer: Sergei Golubchik <sergii(a)pisem.net> > branch nick: 5.1 > timestamp: Tue 2012-01-24 15:08:39 +0100 > message: > remove few hard-coded checks from mtr Why?!? It's much faster to have the checks in mtr_cases.pm. Otherwise we have to start and stop the mysqld server(s), which is often the major part of time spent in a test case. The test suite is slow enough already ... Also, some of these tests _must_ be in mtr_cases, because just starting the server and executing the test for "skip" causes a failure. Eg. I remember that "not_valgrind" works this way, so I think your change will cause some tests to break in valgrind. If we want to improve things so that we have all checks in one place, I would prefer to move everything into mysql-test-run.pl. In the long term, not just for skipping tests but for everything. There is so much cruft in there just do deal with the testsuite being written partly in perl, partly in SQL (parse warnings...), partly in the mysqltest language, partly in C (mysqltest), ... > - if ( $tinfo->{'not_valgrind'} ) > - { > - if ( $::opt_valgrind_mysqld ) > - { > - $tinfo->{'skip'}= 1; > - $tinfo->{'comment'}= "Not compatible with Valgrind testing"; > - return $tinfo; > - } > - } - Kristian

2 2

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 23 Jan '12

23 Jan '12

Yes, I accept On Mon, Jan 23, 2012 at 4:12 AM, Timour Katchaounov <timour(a)montyprogram.com> wrote: > Mark, > > >> The semantics are good for us. The potential overhead from the >> implementation isn't a concern for our uses. What was the feedback >> from the MPAB code review? > > > I haven't submitted the code for review because there are few more > small items to complete, however, the current solution was discussed > with Monty and Igor, and we all came to an agreement that this is the > best solution. > > Speaking of overhead, if the LIMIT_ROWS_EXAMINED is not present, then > the overhead is an additional IF statement in > handler::increment_statistics(): > > inline void handler::increment_statistics(ulong SSV::*offset) const > { > status_var_increment(table->in_use->status_var.*offset); > + if (table->in_use->examined_rows_limit_cnt < HA_POS_ERROR) > + table->in_use->check_examined_rows_limit(); > } > > If the LIMIT_ROWS_EXAMINED clause is present, the overhead is this inline > method: > > /** > Check if the number of rows accessed by a statement exceeded > LIMIT_ROWS_EXAMINED. If so, stop execution. > */ > void check_examined_rows_limit() > { > if (++status_var.accessed_rows_and_keys > examined_rows_limit_cnt) > { > push_warning_printf(this, MYSQL_ERROR::WARN_LEVEL_WARN, > ER_QUERY_EXCEEDED_EXAMINED_ROWS_LIMIT, > ER(ER_QUERY_EXCEEDED_EXAMINED_ROWS_LIMIT), > status_var.accessed_rows_and_keys); > killed= ABORT_QUERY; > } > } > > I believe this overhead for each handler call is negligible. If the overhead > is measurable, then we could improve by making handler::increment_statistics > a function pointer and choosing the right implementation before execution. > This can easily be done if needed. > > Ok, so I will assume your reply means that you accept this approach, and > will > complete the feature ASAP. > > > Timour > > >> >> On Fri, Jan 20, 2012 at 7:37 AM, MARK CALLAGHAN<mdcallag(a)gmail.com> >> wrote: >>> >>> OK, will have feedback in a few days. >>> >>> On Fri, Jan 20, 2012 at 6:45 AM, Timour Katchaounov >>> <timour(a)montyprogram.com> wrote: >>>> >>>> Hello Mark, >>>> >>>> >>>>> I want a variant of the LIMIT clause that limits the number of rows >>>>> examined during SELECT processing. This should return OK when the >>>>> limit is reached -- something like NESTED_LOOP_QUERY_LIMIT. While >>>>> LIMIT can be LIMIT x and LIMIT x,y. This only supports one argument -- >>>>> LIMIT_ROWS_EXAMINED x. Are you interested in implementing this feature >>>>> for me? We will sponsor the work. The purpose of the feature is to >>>>> prevent queries from taking too long when there isn't a great index >>>>> and many rows might be filtered. >>>>> >>>> >>>> After examining few alternatives, I implemented a pretty complete >>>> prototype of LIMIT_ROWS_EXAMINED. Please have a look at the description >>>> of the task here: >>>> https://mariadb.atlassian.net/browse/MDEV-28 >>>> >>>> It is important to notice that the current implementation will stop >>>> execution when LIMIT_ROWS_EXAMINED is reached irrespective of the >>>> query execution strategies used (thus not only for JOINs, but also >>>> writing/reading to temp tables, sorting, and single-table access methods >>>> that scan too many rows). This approach also is future-proof with >>>> respect to adding new query processing algorithms because the counting >>>> is done at the handler level. >>>> >>>> The current approach is such, that it should be fairly easy to backport >>>> the feature to almost any MariaDB/MySQL. >>>> >>>> Please let me know if this is what you want. If so, then I will proceed >>>> with the remaining polishing that is in the TODO list and will get an >>>> internal review. >>>> >>>> You can also have a look at the small example in the comments below the >>>> description to get a feeling what is the behavior. >>>> >>>> I can also send you a patch of the current version in case you want to >>>> play with the feature before it is pushed. >>>> >>>> Timour >>> >>> >>> >>> >>> -- >>> Mark Callaghan >>> mdcallag(a)gmail.com >> >> >> >> > -- Mark Callaghan mdcallag(a)gmail.com

1 0

[Maria-developers] MDEV-30: "mtr extensions for storage engine testing" review
by Kristian Nielsen 23 Jan '12

23 Jan '12

Hi Serg! As promised, I read through your MDEV-30, "mtr extensions for storage engine testing". Generally I think it looks good and reasonable. Here are a few comments: - --record should have options so that it can generate .rdiff or .COMBI.result. So one could say eg. ./mtr --record=rdiff <some test> to produce <whatever>.rdiff. It's not entirely trivial what the exact syntax should be due to the complicated structure of result file names... - Windows (the usual problem child :-( ) has no native `patch` tool. Will we require it to be installed, or will we gracefully skip tests that need it if no patch is available? - About the "options" at the end about file names wrt. suites: I did not fully understand - but it seems important that whatever is done, existing lots of test cases from Oracle/MySQL can be used without having to rewrite their --source statements. Will this be the case? Hope this helps, - Kristian.

2 1

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 20 Jan '12

20 Jan '12

OK, will have feedback in a few days. On Fri, Jan 20, 2012 at 6:45 AM, Timour Katchaounov <timour(a)montyprogram.com> wrote: > Hello Mark, > > >> I want a variant of the LIMIT clause that limits the number of rows >> examined during SELECT processing. This should return OK when the >> limit is reached -- something like NESTED_LOOP_QUERY_LIMIT. While >> LIMIT can be LIMIT x and LIMIT x,y. This only supports one argument -- >> LIMIT_ROWS_EXAMINED x. Are you interested in implementing this feature >> for me? We will sponsor the work. The purpose of the feature is to >> prevent queries from taking too long when there isn't a great index >> and many rows might be filtered. >> > > After examining few alternatives, I implemented a pretty complete > prototype of LIMIT_ROWS_EXAMINED. Please have a look at the description > of the task here: > https://mariadb.atlassian.net/browse/MDEV-28 > > It is important to notice that the current implementation will stop > execution when LIMIT_ROWS_EXAMINED is reached irrespective of the > query execution strategies used (thus not only for JOINs, but also > writing/reading to temp tables, sorting, and single-table access methods > that scan too many rows). This approach also is future-proof with > respect to adding new query processing algorithms because the counting > is done at the handler level. > > The current approach is such, that it should be fairly easy to backport > the feature to almost any MariaDB/MySQL. > > Please let me know if this is what you want. If so, then I will proceed > with the remaining polishing that is in the TODO list and will get an > internal review. > > You can also have a look at the small example in the comments below the > description to get a feeling what is the behavior. > > I can also send you a patch of the current version in case you want to > play with the feature before it is pushed. > > Timour -- Mark Callaghan mdcallag(a)gmail.com

1 1

Re: [Maria-developers] [Commits] Rev 3227: Fix embedded build on Windows. in file:///H:/bzr/5.5/
by Sergei Golubchik 20 Jan '12

20 Jan '12

Hi, Vladislav! On Jan 20, Vladislav Vaintroub wrote: > revno: 3227 > revision-id: wlad(a)montyprogram.com-20120120155435-y8tyd01st3fpbq1e > parent: wlad(a)montyprogram.com-20120120113906-f6wcj47dyo6jyt45 > committer: Vladislav Vaintroub <wlad(a)montyprogram.com> > branch nick: 5.5 > timestamp: Fri 2012-01-20 16:54:35 +0100 > message: > Fix embedded build on Windows. > === modified file 'mysys/CMakeLists.txt' > --- a/mysys/CMakeLists.txt 2012-01-20 00:57:58 +0000 > +++ b/mysys/CMakeLists.txt 2012-01-20 15:54:35 +0000 > @@ -46,7 +46,7 @@ > SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_addr_resolve.c) > ENDIF() > > -IF(WITH_SAFEMALLOC OR NOT HAVE_CXX_NEW) > +IF(NOT HAVE_CXX_NEW) > ADD_DEFINITIONS( -DUSE_MYSYS_NEW) Why is that? I thought that WITH_SAFEMALLOC is always off on Windows? Note, that we should always use mysys/new.cc when safemalloc is enabled. Regards, Sergei

2 2

Re: [Maria-developers] [Commits] Rev 3020: MWL#192: Non-blocking client API for libmysqlclient. in http://bazaar.launchpad.net/~maria-captains/maria/5.2
by Michael Widenius 09 Jan '12

09 Jan '12

Hi! >>>>> "knielsen" == knielsen <knielsen(a)knielsen-hq.org> writes: knielsen> At http://bazaar.launchpad.net/~maria-captains/maria/5.2 knielsen> ------------------------------------------------------------ knielsen> revno: 3020 knielsen> revision-id: knielsen(a)knielsen-hq.org-20110920104925-huxke80yuq1zrvcx knielsen> parent: monty(a)askmonty.org-20110816160131-4kju8si1nqqnohxg knielsen> committer: knielsen(a)knielsen-hq.org knielsen> branch nick: tmp2 knielsen> timestamp: Tue 2011-09-20 12:49:25 +0200 knielsen> message: knielsen> MWL#192: Non-blocking client API for libmysqlclient. knielsen> All client functions that can block on I/O have alternate _start() and knielsen> _cont() versions that do not block but return control back to the knielsen> application, which can then issue I/O wait in its own fashion and later knielsen> call back into the library to continue the operation. knielsen> Works behind the scenes by spawning a co-routine/fiber to run the knielsen> blocking operation and suspend it while waiting for I/O. This knielsen> co-routine/fiber use is invisible to applications. knielsen> For i368/x86_64 on GCC, uses very fast assembler co-routine support. On knielsen> Windows uses native Win32 Fibers. Falls back to POSIX ucontext on other knielsen> platforms. Assembler routines for more platforms are relatively easy to knielsen> add by extending mysys/my_context.c, eg. similar to the Lua lcoco knielsen> library. knielsen> For testing, mysqltest and mysql_client_test are extended with the knielsen> option --non-blocking-api. This causes the programs to use the knielsen> non-blocking API for database access. mysql-test-run.pl has a similar knielsen> option --non-blocking-api that uses this, as well as additional knielsen> testcases. knielsen> An example program tests/async_queries.c is included that uses the new knielsen> non-blocking API with libevent to show how, in a single-threaded knielsen> program, to issue many queries in parallel against a database. <cut> +++ client/async_example.c 2011-09-20 10:49:25 +0000 @@ -0,0 +1,207 @@ +/* + Copyright 2011 Kristian Nielsen and Monty Program Ab. + + Experiments with non-blocking libmysql. + + This is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this. If not, see <http://www.gnu.org/licenses/>. +*/ Please change license to LGPL for this and the other new files (so we can add them to our new LGPL client library) + + +#ifndef __WIN__ +#include <poll.h> +#else +#include <WinSock2.h> +#endif You don't need to incldue Winsock2.h; This is automaticly included by mysql.h. +#include <stdlib.h> +#include <stdio.h> +#include <mysql.h> <cut> === modified file 'client/mysqltest.cc' --- client/mysqltest.cc 2011-05-18 13:17:26 +0000 +++ client/mysqltest.cc 2011-09-20 10:49:25 +0000 @@ -60,6 +60,12 @@ #define SIGNAL_FMT "signal %d" #endif === modified file 'include/Makefile.am' --- include/Makefile.am 2011-05-03 16:10:10 +0000 +++ include/Makefile.am 2011-09-20 10:49:25 +0000 @@ -46,7 +46,7 @@ atomic/rwlock.h atomic/x86-gcc.h \ atomic/generic-msvc.h \ atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \ - wqueue.h waiting_threads.h + wqueue.h waiting_threads.h my_context.h EXTRA_DIST = mysql.h.pp mysql/plugin_auth.h.pp mysql/client_plugin.h.pp CMakeLists.txt === added file 'include/my_context.h' --- include/my_context.h 1970-01-01 00:00:00 +0000 +++ include/my_context.h 2011-09-20 10:49:25 +0000 @@ -0,0 +1,222 @@ +/* + Copyright 2011 Kristian Nielsen + + Experiments with non-blocking libmysql. + + This is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + This is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this. If not, see <http://www.gnu.org/licenses/>. +*/ + +/* + Simple API for spawning a co-routine, to be used for async libmysqlclient. + + Idea is that by implementing this interface using whatever facilities are + available for given platform, we can use the same code for the generic + libmysqlclient-async code. + + (This particular implementation uses Posix ucontext swapcontext().) +*/ + +#ifdef __WIN__ +#define MY_CONTEXT_USE_WIN32_FIBERS 1 +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) +#define MY_CONTEXT_USE_X86_64_GCC_ASM +#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) +#define MY_CONTEXT_USE_I386_GCC_ASM +#else +#define MY_CONTEXT_USE_UCONTEXT +#endif + +#ifdef MY_CONTEXT_USE_WIN32_FIBERS +struct my_context { + void (*user_func)(void *); + void *user_arg; + void *app_fiber; + void *lib_fiber; + int return_value; +#ifndef DBUG_OFF + void *dbug_state; +#endif +}; +#endif + + +#ifdef MY_CONTEXT_USE_UCONTEXT +#include <ucontext.h> + +struct my_context { + void (*user_func)(void *); + void *user_data; + void *stack; + size_t stack_size; + ucontext_t base_context; + ucontext_t spawned_context; + int active; +#ifdef HAVE_VALGRIND_VALGRIND_H + unsigned int valgrind_stack_id; +#endif +#ifndef DBUG_OFF + void *dbug_state; +#endif +}; +#endif + + +#ifdef MY_CONTEXT_USE_X86_64_GCC_ASM +#include <stdint.h> + +struct my_context { + uint64_t save[9]; + void *stack_top; + void *stack_bot; +#ifdef HAVE_VALGRIND_VALGRIND_H + unsigned int valgrind_stack_id; +#endif +#ifndef DBUG_OFF + void *dbug_state; +#endif +}; +#endif + + +#ifdef MY_CONTEXT_USE_I386_GCC_ASM +#include <stdint.h> + +struct my_context { + uint64_t save[7]; + void *stack_top; + void *stack_bot; +#ifdef HAVE_VALGRIND_VALGRIND_H + unsigned int valgrind_stack_id; +#endif +#ifndef DBUG_OFF + void *dbug_state; +#endif +}; +#endif + + +/* + Initialize an asynchroneous context object. + Returns 0 on success, non-zero on failure. +*/ +extern int my_context_init(struct my_context *c, size_t stack_size); + +/* Free an asynchroneous context object, deallocating any resources used. */ +extern void my_context_destroy(struct my_context *c); + +/* + Spawn an asynchroneous context. The context will run the supplied user + function, passing the supplied user data pointer. + + The context must have been initialised with my_context_init() prior to + this call. + + The user function may call my_context_yield(), which will cause this + function to return 1. Then later my_context_continue() may be called, which + will resume the asynchroneous context by returning from the previous + my_context_yield() call. + + When the user function returns, this function returns 0. + + In case of error, -1 is returned. +*/ +extern int my_context_spawn(struct my_context *c, void (*f)(void *), void *d); + +/* + Suspend an asynchroneous context started with my_context_spawn. + + When my_context_yield() is called, execution immediately returns from the + last my_context_spawn() or my_context_continue() call. Then when later + my_context_continue() is called, execution resumes by returning from this + my_context_yield() call. + + Returns 0 if ok, -1 in case of error. +*/ +extern int my_context_yield(struct my_context *c); + +/* + Resume an asynchroneous context. The context was spawned by + my_context_spawn(), and later suspended inside my_context_yield(). + + The asynchroneous context may be repeatedly suspended with + my_context_yield() and resumed with my_context_continue(). + + Each time it is suspended, this function returns 1. When the originally + spawned user function returns, this function returns 0. + + In case of error, -1 is returned. +*/ +extern int my_context_continue(struct my_context *c); + + +struct mysql_async_context { + /* + This is set to the value that should be returned from foo_start() or + foo_cont() when a call is suspended. + It is also set to the event(s) that triggered when a suspended call is + resumed, eg. whether we woke up due to connection completed or timeout + in mysql_real_connect_cont(). + */ + unsigned int ret_status; + /* + This is set to the result of the whole asynchronous operation when it + completes. It uses a union, as different calls have different return + types. + */ + union { + void *r_ptr; + const void *r_const_ptr; + int r_int; + my_bool r_my_bool; + } ret_result; + /* + The timeout value, for suspended calls that need to wake up on a timeout + (eg. mysql_real_connect_start(). + */ + unsigned int timeout_value; + /* + This flag is set when we are executing inside some asynchronous call + foo_start() or foo_cont(). It is used to decide whether to use the + synchronous or asynchronous version of calls that may block such as + recv(). + + Note that this flag is not set when a call is suspended, eg. after + returning from foo_start() and before re-entering foo_cont(). + */ + my_bool active; + /* + This flag is set when an asynchronous operation is in progress, but + suspended. Ie. it is set when foo_start() or foo_cont() returns because + the operation needs to block, suspending the operation. + + It is used to give an error (rather than crash) if the application + attempts to call some foo_cont() method when no suspended operation foo is + in progress. + */ + my_bool suspended; + /* + If non-NULL, this is a pointer to a callback hook that will be invoked with + the user data argument just before the context is suspended, and just after + it is resumed. + */ + void (*suspend_resume_hook)(my_bool suspend, void *user_data); + void *suspend_resume_hook_user_data; + /* + This is used to save the execution contexts so that we can suspend an + operation and switch back to the application context, to resume the + suspended context later when the application re-invokes us with + foo_cont(). + */ + struct my_context async_context; +}; === modified file 'include/my_dbug.h' --- include/my_dbug.h 2011-02-20 16:51:43 +0000 +++ include/my_dbug.h 2011-09-20 10:49:25 +0000 @@ -83,6 +83,8 @@ extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); extern void _db_flush_(); +extern void dbug_swap_code_state(void **code_state_store); +extern void dbug_free_code_state(void **code_state_store); Please define a macros DBUG_FREE_CODE_STATE / DBUG_SWAP_CODE_STATE that are mapped to the aboe if DBUG is defined and to "do {} while (0)" otherwise. This allows you to replace: #ifndef DBUG_OFF dbug_free_code_state(&c->dbug_state); #endif with DBUG_FREE_CODE_STATE(&c->dbug_state); (It's always nice to not have a lot of #ifdef in the code). +++ include/mysql.h 2011-09-20 10:49:25 +0000 void *extension; } MYSQL_PARAMETERS; +/* + Flag bits, the asynchronous methods return a combination of these ORed + together to let the application know when to resume the suspended operation. +*/ +typedef enum { + MYSQL_WAIT_READ= 1, /* Wait for data to be available on socket to read */ + /* mysql_get_socket_fd() will return socket descriptor*/ + MYSQL_WAIT_WRITE= 2, /* Wait for socket to be ready to write data */ + MYSQL_WAIT_EXCEPT= 4, /* Wait for select() to mark exception on socket */ + MYSQL_WAIT_TIMEOUT= 8 /* Wait until timeout occurs. Value of timeout can be */ + /* obtained from mysql_get_timeout_value() */ +} MYSQL_ASYNC_STATUS; + Why have enum's instead of defines ? (As these are bits and you are not going to use 'switch' on these, defines makes more sense). #ifdef USE_OLD_FUNCTIONS MYSQL * STDCALL mysql_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd); +int STDCALL mysql_connect_start(MYSQL **ret, MYSQL *mysql, + const char *host, const char *user, + const char *passwd); +int STDCALL mysql_connect_cont(MYSQL **ret, MYSQL *mysql, + int status); int STDCALL mysql_create_db(MYSQL *mysql, const char *DB); +int STDCALL mysql_create_db_start(int *ret, MYSQL *mysql, + const char *DB); +int STDCALL mysql_create_db_cont(int *ret, MYSQL *mysql, + int status); +int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); +int STDCALL mysql_drop_db_start(int *ret, MYSQL *mysql, + const char *DB); +int STDCALL mysql_drop_db_cont(int *ret, MYSQL *mysql, int status); int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT) #endif If USE_OLD_FUNCTIONS is defined, you don't have to provide the new api. These are deprecated functions that we don't want people to use so there is no reason to provide 'better' versions of them... === modified file 'include/sql_common.h' --- include/sql_common.h 2010-04-01 09:04:26 +0000 +++ include/sql_common.h 2011-09-20 10:49:25 +0000 @@ -26,11 +26,18 @@ extern const char *cant_connect_sqlstate; extern const char *not_error_sqlstate; + +struct mysql_async_context; + struct st_mysql_options_extention { char *plugin_dir; char *default_auth; }; +struct st_mysql_extension { + struct mysql_async_context *async_context; +}; + Why provide 'st_mysql_extension' in a public file? Isn't it enough to have this only in a local file in the client directory? (We don't want anyone to access this structure in any clients) === modified file 'include/violite.h' --- include/violite.h 2010-01-29 10:42:31 +0000 +++ include/violite.h 2011-09-20 10:49:25 +0000 @@ -194,6 +194,8 @@ char *read_pos; /* start of unfetched data in the read buffer */ char *read_end; /* end of unfetched data */ + struct mysql_async_context *async_context; /* For non-blocking API */ + uint read_timeout, write_timeout; /* function pointers. They are similar for socket/SSL/whatever */ void (*viodelete)(Vio*); int (*vioerrno)(Vio*); Hm, I haven't thought about that it's safe to add new things to struct st_vio without breaking the interface. That's good and useful to know! <cut> <cut> === added file 'mysql-test/t/non_blocking_api.test' --- mysql-test/t/non_blocking_api.test 1970-01-01 00:00:00 +0000 +++ mysql-test/t/non_blocking_api.test 2011-09-20 10:49:25 +0000 @@ -0,0 +1,18 @@ +# Test mixing the use of blocking and non-blocking API in a single connection. + +--enable_non_blocking_api +connect (con_nonblock,localhost,root,,test); +--disable_non_blocking_api +connect (con_normal,localhost,root,,test); + Usually all test starts with drop table if exists t1; This is mostly useful when you want to run the tests against an external server. Not critical but good practice to do... <cut> === added file 'mysys/my_context.c' --- mysys/my_context.c 1970-01-01 00:00:00 +0000 +++ mysys/my_context.c 2011-09-20 10:49:25 +0000 @@ -0,0 +1,749 @@ +/* + Copyright 2011 Kristian Nielsen + + Experiments with non-blocking libmysql. + Add the information text after the copyright. (Is the comment still relevant?) + This is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. <cut> + Implementation of async context spawning using Posix ucontext and + swapcontext(). +*/ + +#include <stdio.h> +#include <errno.h> + You can remove the above as mysys_priv.h will include these anyway. +#include "mysys_priv.h" +#include "my_context.h" + +#ifdef HAVE_VALGRIND_VALGRIND_H +#include <valgrind/valgrind.h> +#endif Shouldn't this also be depending on the HAVE_valgrind define? <cut> +int +my_context_init(struct my_context *c, size_t stack_size) +{ + if (2*sizeof(int) < sizeof(void *)) + { + fprintf(stderr, + "Error: Unable to store pointer in 2 ints on this architecture\n"); + return -1; + } Please make the above a compile time error instead. #if SIZEOF_CHARP < SIZEOF_INT*2 #error Error: Unable to store pointer in 2 ints on this architecture #endif I think it would be a good idea to do here: bzero(*c, sizeof(*c)); This is better than assuming that 'c' is zeroed on entry. + if (!(c->stack= malloc(stack_size))) + return -1; /* Out of memory */ + c->stack_size= stack_size; +#ifdef HAVE_VALGRIND_VALGRIND_H + c->valgrind_stack_id= + VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size); +#endif +#ifndef DBUG_OFF + c->dbug_state= NULL; +#endif If we do the bzero, you can remove the above + return 0; +} <cut> +int +my_context_init(struct my_context *c, size_t stack_size) +{ + if (!(c->stack_bot= malloc(stack_size))) + return -1; /* Out of memory */ Add bzero of 'c' here. <cut> +int +my_context_init(struct my_context *c, size_t stack_size) +{ Add bzero() here. <cut> +int +my_context_init(struct my_context *c, size_t stack_size) +{ Add bzero here. +#ifndef DBUG_OFF + c->dbug_state= NULL; +#endif + c->lib_fiber= CreateFiber(stack_size, my_context_trampoline, c); + if (c->lib_fiber) + return 0; + else + return -1; Remove else or do: return c->lib_fiber ? 0 : -1; +} <cut> === modified file 'sql-common/client.c' --- sql-common/client.c 2011-03-18 15:03:43 +0000 +++ sql-common/client.c 2011-09-20 10:49:25 +0000 @@ -108,6 +108,7 @@ #include "client_settings.h" #include <sql_common.h> #include <mysql/client_plugin.h> +#include "my_context.h" Should probably be: #include <my_context.h> +#define mysql_extension_get(MYSQL, X) \ + ((MYSQL)->extension ? (MYSQL)->extension->X : NULL) +#define mysql_extension_set(MYSQL, X, VAL) \ + if (!(MYSQL)->extension) \ + (MYSQL)->extension= (struct st_mysql_extension *) \ + my_malloc(sizeof(struct st_mysql_extension), \ + MYF(MY_WME | MY_ZEROFILL)); \ + (MYSQL)->extension->X= VAL; + In 5.3 and 5.5 we have the following macro: #define extension_set(OPTS, X, VAL) \ if (!(OPTS)->extension) \ (OPTS)->extension= (struct st_mysql_options_extention *) \ my_malloc(sizeof(struct st_mysql_options_extention), \ MYF(MY_WME | MY_ZEROFILL)); \ (OPTS)->extension->X= VAL; Why not also store your new extension in mysql->option->extension instead of mysql->extensions ? This would allow you to reuse the existing macros.. +/* + Fetch the context for asynchronous API calls, allocating a new one if + necessary. +*/ +#define STACK_SIZE (4096*15) + +struct mysql_async_context * +mysql_get_async_context(MYSQL *mysql) +{ + struct mysql_async_context *b; + if ((b= mysql_extension_get(mysql, async_context))) + return b; + + if (!(b= (struct mysql_async_context *) + my_malloc(sizeof(*b), MYF(MY_ZEROFILL)))) + { + set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate); + return NULL; + } Remove the MY_ZEROFILL and let my_context_init() do it. (Makes the function cleaner). + if (my_context_init(&b->async_context, STACK_SIZE)) + { + my_free(b, MYF(0)); + return NULL; + } <cut> /************************************************************************** Get column lengths of the current row @@ -2537,6 +2577,26 @@ } +static int +connect_sync_or_async(MYSQL *mysql, NET *net, my_socket fd, + const struct sockaddr *name, uint namelen) +{ + extern int my_connect_async(struct mysql_async_context *b, my_socket fd, + const struct sockaddr *name, uint namelen, + uint timeout); Please move the above definitioon to header file that is also read by the file the defines the function. (Otherwise someone can change the function without you getting a compiler error). + struct mysql_async_context *actxt= mysql_extension_get(mysql, async_context); + + if (actxt && actxt->active) + { + my_bool old_mode; + vio_blocking(net->vio, FALSE, &old_mode); + return my_connect_async(actxt, fd, name, namelen, + mysql->options.connect_timeout); + } + else Remove else + return my_connect(fd, name, namelen, mysql->options.connect_timeout); +} + <cut> my_bool mysql_reconnect(MYSQL *mysql) { <cut> + if ((ctxt= mysql_extension_get(mysql, async_context)) && ctxt->active) + { + hook_data.orig_mysql= mysql; + hook_data.new_mysql= &tmp_mysql; + hook_data.orig_vio= mysql->net.vio; + my_context_install_suspend_resume_hook(ctxt, my_suspend_hook, &hook_data); + } if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, mysql->db, mysql->port, mysql->unix_socket, mysql->client_flag | CLIENT_REMEMBER_OPTIONS)) { + if (ctxt) + my_context_install_suspend_resume_hook(ctxt, NULL, NULL); Change the above to: res= mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, mysql->db, mysql->port, mysql->unix_socket, mysql->client_flag | CLIENT_REMEMBER_OPTIONS); if (ctxt) my_context_install_suspend_resume_hook(ctxt, NULL, NULL); if (!res) .... This way you only need to call my_context_install_suspend_resume_hook(ctxt, NULL, NULL) once. mysql->net.last_errno= tmp_mysql.net.last_errno; strmov(mysql->net.last_error, tmp_mysql.net.last_error); strmov(mysql->net.sqlstate, tmp_mysql.net.sqlstate); @@ -3109,13 +3220,18 @@ if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname)) { DBUG_PRINT("error", ("mysql_set_character_set() failed")); + tmp_mysql.extension= NULL; bzero((char*) &tmp_mysql.options,sizeof(tmp_mysql.options)); mysql_close(&tmp_mysql); + if (ctxt) + my_context_install_suspend_resume_hook(ctxt, NULL, NULL); Please remove the above call. mysql->net.last_errno= tmp_mysql.net.last_errno; strmov(mysql->net.last_error, tmp_mysql.net.last_error); strmov(mysql->net.sqlstate, tmp_mysql.net.sqlstate); DBUG_RETURN(1); } + if (ctxt) + my_context_install_suspend_resume_hook(ctxt, NULL, NULL); Please remove the above call. <cut> +static void +mysql_close_free_extension(MYSQL *mysql) +{ + if (mysql->extension) + { + if (mysql->extension->async_context) + { + my_context_destroy(&mysql->extension->async_context->async_context); + my_free(mysql->extension->async_context, MYF(0)); + } + my_free(mysql->extension, MYF(0)); + mysql->extension= NULL; + } +} I still think it would be better to use mysql->option.extension as in this case you can do the above with 2 lines of code and we would not need another function. <discussions over IRC about this....> The reason for not using mysql->options.extension was only becasue mysql_real_connect() freed the options on failure. This code is not needed as they will be freed by mysql_close() anyway. So I suggest you remove the code: if (!(client_flag & CLIENT_REMEMBER_OPTIONS)) mysql_close_free_options(mysql); from mysql_real_connect() and change to use mysql->options.extension instead static void mysql_close_free(MYSQL *mysql) { my_free((uchar*) mysql->host_info,MYF(MY_ALLOW_ZERO_PTR)); @@ -3304,6 +3439,33 @@ (As some clients call this after mysql_real_connect() fails) */ +/* + mysql_close() can actually block, at least in theory, if the socket buffer + is full when sending the COM_QUIT command. + + On the other hand, the latter part of mysql_close() needs to free the stack + used for non-blocking operation of blocking stuff, so that later part can + _not_ be done non-blocking. + + Therefore, mysql_pre_close() is used to run the parts of mysql_close() that + may block. It can be called before mysql_close(), and in that case + mysql_close() is guaranteed not to need to block. +*/ Consider changing the name to 'mysql_slow_part_of_close()' and make it static if possible. +void mysql_pre_close(MYSQL *mysql) +{ + if (!mysql) + return; Remove test; impossible with current code, see belove in mysql_close. + /* If connection is still up, send a QUIT message */ + if (mysql->net.vio != 0) + { + free_old_query(mysql); + mysql->status=MYSQL_STATUS_READY; /* Force command */ + mysql->reconnect=0; + simple_command(mysql,COM_QUIT,(uchar*) 0,0,1); + end_server(mysql); /* Sets mysql->net.vio= 0 */ + } +} + void STDCALL mysql_close(MYSQL *mysql) { DBUG_ENTER("mysql_close"); @@ -3311,16 +3473,9 @@ + +my_socket STDCALL +mysql_get_socket(const MYSQL *mysql) +{ + if (mysql->net.vio) + return mysql->net.vio->sd; + else remove else + return INVALID_SOCKET; +} +++ sql-common/mysql_async.c 2011-09-20 10:49:25 +0000 +#ifdef __WIN__ +/* + Windows does not support MSG_DONTWAIT for send()/recv(). So we need to ensure + that the socket is non-blocking at the start of every operation. +*/ +#define WIN_SET_NONBLOCKING(mysql) { \ + my_bool old_mode__; \ + if ((mysql)->net.vio) vio_blocking((mysql)->net.vio, FALSE, &old_mode__); \ + } old_mode__ -> old_mode +#else +#define WIN_SET_NONBLOCKING(mysql) +#endif + +extern struct mysql_async_context *mysql_get_async_context(MYSQL *mysql); Move to header file. +/* Asynchronous connect(); socket must already be set non-blocking. */ +int +my_connect_async(struct mysql_async_context *b, my_socket fd, + const struct sockaddr *name, uint namelen, uint timeout) +{ + int res; +#ifdef __WIN__ + int s_err_size; +#else + socklen_t s_err_size; +#endif It would be nice to just define socklen_t for windows, but this isn't critical. You could have a DBUG_ASSERT here to check if socket is really in non blocking. + + /* + Start to connect asynchronously. + If this will block, we suspend the call and return control to the + application context. The application will then resume us when the socket + polls ready for write, indicating that the connection attempt completed. + */ + res= connect(fd, name, namelen); +#ifdef __WIN__ + if (res != 0) + { + int wsa_err= WSAGetLastError(); + if (wsa_err != WSAEWOULDBLOCK) + return res; +#else + if (res < 0) To not have only one { inside the #ifdef / #else I suggest that you move if (res != 0) { before the +#ifdef __WIN__. This works on both windows and Unix This will make the number of { balance + { + if (errno != EINPROGRESS && errno != EALREADY && errno != EAGAIN) + return res; +#endif + b->timeout_value= timeout; + b->ret_status= MYSQL_WAIT_WRITE | + (timeout ? MYSQL_WAIT_TIMEOUT : 0); +#ifdef __WIN__ + b->ret_status|= MYSQL_WAIT_EXCEPT; +#endif How about setting b->ret_status to 0 before res= connect() ? Then you can move the above code to the previous #ifdef __WIN__ and change the setting of b->ret_status to use |= This removes the extra ifdef __WIN__ and also ensures that ret_status is 0 if evertything went well. (not required but still better than a random value when trying to understand what's going in). + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(TRUE, b->suspend_resume_hook_user_data); + my_context_yield(&b->async_context); + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data); + if (b->ret_status & MYSQL_WAIT_TIMEOUT) + return -1; + + s_err_size= sizeof(int); Better to use (safer and more descriptive): s_err_size= sizeof(res); + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*) &res, &s_err_size) != 0) + return -1; <cut> + +ssize_t +my_recv_async(struct mysql_async_context *b, int fd, + unsigned char *buf, size_t size, uint timeout) +{ + ssize_t res; + + for (;;) + { + res= recv(fd, buf, size, +#ifdef __WIN__ + 0 +#else + MSG_DONTWAIT +#endif + ); Better to do before function start: #ifdef __WIN__ #define MSG_DONTWAIT 0 #endif and remove the above #ifdef in middle of call. Another option is to use the IF_WIN() macro: IF_WIN(0, MSG_DONTWAIT) + if (res >= 0 || +#ifdef __WIN__ + WSAGetLastError() != WSAEWOULDBLOCK +#else + (errno != EAGAIN && errno != EINTR) +#endif Please define macro: #define IS_BLOCKING_ERROR IF_WIN(WSAGetLastError() != WSAEWOULDBLOCK, (errno != EAGAIN && errno != EINTR)) and use that instead of having an ifdef in the middle of the code. + ) + return res; + b->ret_status= MYSQL_WAIT_READ; + if (timeout) + { + b->ret_status|= MYSQL_WAIT_TIMEOUT; + b->timeout_value= timeout; + } + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(TRUE, b->suspend_resume_hook_user_data); + my_context_yield(&b->async_context); + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data); The following call was quite confusion as we are checking a variable that we where just setting. <phone call> The reasons is that b->ret_status is both an in an out parameter. We agree to do one of the following to make the code easier to understand: - Change to use different bits for in and out status. - Change to use different variables for in and out status. + if (b->ret_status & MYSQL_WAIT_TIMEOUT) + return -1; + } +} + Add empty row here +ssize_t +my_send_async(struct mysql_async_context *b, int fd, + const unsigned char *buf, size_t size, uint timeout) +{ + ssize_t res; + + for (;;) + { + res= send(fd, buf, size, +#ifdef __WIN__ + 0 +#else + MSG_DONTWAIT +#endif + ); + if (res >= 0 || +#ifdef __WIN__ + WSAGetLastError() != WSAEWOULDBLOCK +#else + (errno != EAGAIN && errno != EINTR) +#endif + ) See comments for previous function how to get rid of the ifdefs' <cut> +#ifdef HAVE_OPENSSL +int +my_ssl_read_async(struct mysql_async_context *b, SSL *ssl, + void *buf, int size) +{ + int res, ssl_err; + + for (;;) + { + res= SSL_read(ssl, buf, size); + if (res >= 0) + return res; + ssl_err= SSL_get_error(ssl, res); + if (ssl_err == SSL_ERROR_WANT_READ) + b->ret_status= MYSQL_WAIT_READ; + else if (ssl_err == SSL_ERROR_WANT_WRITE) + b->ret_status= MYSQL_WAIT_WRITE; + else + return res; + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(TRUE, b->suspend_resume_hook_user_data); + my_context_yield(&b->async_context); + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data); + } +} + +int +my_ssl_write_async(struct mysql_async_context *b, SSL *ssl, + const void *buf, int size) +{ + int res, ssl_err; + + for (;;) + { + res= SSL_write(ssl, buf, size); + if (res >= 0) + return res; + ssl_err= SSL_get_error(ssl, res); + if (ssl_err == SSL_ERROR_WANT_READ) + b->ret_status= MYSQL_WAIT_READ; + else if (ssl_err == SSL_ERROR_WANT_WRITE) + b->ret_status= MYSQL_WAIT_WRITE; + else + return res; + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(TRUE, b->suspend_resume_hook_user_data); + my_context_yield(&b->async_context); + if (b->suspend_resume_hook) + (*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data); + } +} 90 % of the above functions are the same: I would do it this way: static my_bool my_ssl_async_check_result(int *res, struct mysql_async_context *b) { int ssl_err; if (*res >= 0) return 1; ssl_err= SSL_get_error(ssl, *res); if (ssl_err == SSL_ERROR_WANT_READ) b->ret_status= MYSQL_WAIT_READ; else if (ssl_err == SSL_ERROR_WANT_WRITE) b->ret_status= MYSQL_WAIT_WRITE; else return 1; if (b->suspend_resume_hook) (*b->suspend_resume_hook)(TRUE, b->suspend_resume_hook_user_data); my_context_yield(&b->async_context); if (b->suspend_resume_hook) (*b->suspend_resume_hook)(FALSE, b->suspend_resume_hook_user_data); return 0; } And then: my_ssl_read_async(struct mysql_async_context *b, SSL *ssl, void *buf, int size) { int res; for (;;) { res= SSL_read(ssl, buf, size); if (my_ssl_async_check_result(res, b)) return res; } } <cut> +#endif /* HAVE_OPENSSL */ + +unsigned int STDCALL +mysql_get_timeout_value(const MYSQL *mysql) +{ + if (mysql->extension && mysql->extension->async_context) + return mysql->extension->async_context->timeout_value; + else Remove else + return 0; +} + Add empty line +/* + Now create non-blocking definitions for all the calls that may block. + + Each call FOO gives rise to FOO_start() that prepares the MYSQL object for + doing non-blocking calls that can suspend operation mid-way, and then starts + the call itself. And a FOO_start_internal trampoline to assist with running + the real call in a co-routine that can be suspended. And a FOO_cont() that + can continue a suspended operation. +*/ + +#define MK_ASYNC_CALLS(call__, decl_args__, invoke_args__, cont_arg__, mysql_val__, parms_mysql_val__, parms_assign__, ret_type__, err_val__, ok_val__, extra1__) \ +static void \ +call__ ## _start_internal(void *d) \ +{ \ As discussed on IRC, it would be good to have the functions declarations outside of the macro; This makes it easier to make breakpoints in the code and help debugging. + struct call__ ## _params *parms; \ + ret_type__ ret; \ + struct mysql_async_context *b; \ + \ + parms= (struct call__ ## _params *)d; \ + b= (parms_mysql_val__)->extension->async_context; \ + \ + ret= call__ invoke_args__; \ + b->ret_result. ok_val__ = ret; \ + b->ret_status= 0; \ +} \ +int STDCALL \ +call__ ## _start decl_args__ \ +{ \ + int res; \ + struct mysql_async_context *b; \ + struct call__ ## _params parms; \ + \ + extra1__ \ + if (!(b= mysql_get_async_context((mysql_val__)))) \ + { \ + *ret= err_val__; \ + return 0; \ + } \ Instead of calling mysql_get_async_context, another option would be to do: mysql_options(mysql, MYSQL_OPT_ASYNC_IO, (char*) &STACK_SIZE) And if STACK_SIZE is 0, then we allocate our default stack size then you can change the above code to: b= mysql_val__->options.extension->async_context; If it doesn't exist, it's ok to crash on access. (Same as if mysql is 0) + parms_assign__ \ + \ + b->active= 1; \ + res= my_context_spawn(&b->async_context, call__ ## _start_internal, &parms);\ + b->active= 0; \ Set also b->suspended= 0 here. (Makes the rest of the code shorter) + if (res < 0) \ + { \ + set_mysql_error((mysql_val__), CR_OUT_OF_MEMORY, unknown_sqlstate); \ How do we know the reason is out of memory? (Just curious) + b->suspended= 0; \ + *ret= err_val__; \ + return 0; \ + } \ + else if (res > 0) \ Remove else + { \ + /* Suspended. */ \ + b->suspended= 1; \ + return b->ret_status; \ + } \ + else \ Remove else and {} + { \ + /* Finished. */ \ + b->suspended= 0; \ + *ret= b->ret_result. ok_val__; \ + return 0; \ + } \ +} \ If you change to test for (res > 0) first, you can combine the two return 0 to one row and thus remove some of the { }. Makes the code shorter (at least to read): b->active= b->suspended= 0; if (res > 0) { b->suspended= 1; return b->ret_status; } if (res < 0) { set_mysql_error((mysql_val__), CR_OUT_OF_MEMORY, unknown_sqlstate); *ret= err_val__; } else *ret= b->ret_result. ok_val__; /* Finished. */ return 0; +int STDCALL \ +call__ ## _cont(ret_type__ *ret, cont_arg__, int ready_status) \ +{ \ + int res; \ + struct mysql_async_context *b; \ + \ + b= (mysql_val__)->extension->async_context; \ + if (!b || !b->suspended) \ Remove test for !b; You can assume it's exists. (We can never protect aginst wrong usage) + { \ + set_mysql_error((mysql_val__), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);\ + *ret= err_val__; \ + return 0; \ + } \ + \ + b->active= 1; \ + b->ret_status= ready_status; \ + res= my_context_continue(&b->async_context); \ + b->active= 0; \ + if (res < 0) \ + { \ + set_mysql_error((mysql_val__), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + b->suspended= 0; \ + *ret= err_val__; \ + return 0; \ + } \ + else if (res > 0) \ + { \ + /* Suspended. */ \ + return b->ret_status; \ + } \ + else \ + { \ + /* Finished. */ \ + b->suspended= 0; \ + *ret= b->ret_result. ok_val__; \ + return 0; \ + } \ You can do the same 'suspend and check for error' optimization I did in previous function to reduce the above code with 4 lines. +} + +#define MK_ASYNC_CALLS_VOID_RETURN(call__, decl_args__, invoke_args__, cont_arg__, mysql_val__, parms_mysql_val__, parms_assign__, extra1__) \ +static void \ +call__ ## _start_internal(void *d) \ +{ \ + struct call__ ## _params *parms; \ + struct mysql_async_context *b; \ + \ + parms= (struct call__ ## _params *)d; \ + b= (parms_mysql_val__)->extension->async_context; \ + \ + call__ invoke_args__; \ + b->ret_status= 0; \ +} \ +int STDCALL \ +call__ ## _start decl_args__ \ +{ \ + int res; \ + struct mysql_async_context *b; \ + struct call__ ## _params parms; \ + \ + extra1__ \ + if (!(b= mysql_get_async_context((mysql_val__)))) \ + { \ + return 0; \ + } \ You can remove test if we know that b always exists. At least you can remove '{' + parms_assign__ \ + \ + b->active= 1; \ + res= my_context_spawn(&b->async_context, call__ ## _start_internal, &parms);\ + b->active= 0; \ + if (res < 0) \ + { \ + set_mysql_error((mysql_val__), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + b->suspended= 0; \ + return 0; \ + } \ + else if (res > 0) \ + { \ + /* Suspended. */ \ + b->suspended= 1; \ + return b->ret_status; \ + } \ + else \ + { \ + /* Finished. */ \ + b->suspended= 0; \ + return 0; \ + } \ +} \ See previous comment of how to remove 4 code lines. +int STDCALL \ +call__ ## _cont(cont_arg__, int ready_status) \ +{ \ + int res; \ + struct mysql_async_context *b; \ + \ + b= (mysql_val__)->extension->async_context; \ + if (!b || !b->suspended) \ Assume !b exists + { \ + set_mysql_error((mysql_val__), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);\ + return 0; \ + } \ + \ + b->active= 1; \ + b->ret_status= ready_status; \ + res= my_context_continue(&b->async_context); \ + b->active= 0; \ + if (res < 0) \ + { \ + set_mysql_error((mysql_val__), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + b->suspended= 0; \ + return 0; \ + } \ + else if (res > 0) \ + { \ + /* Suspended. */ \ + return b->ret_status; \ + } \ + else \ + { \ + /* Finished. */ \ + b->suspended= 0; \ + return 0; \ + } \ +} Remove extra lines above. Add comment here (and for other similar structs): /* This struct is used by the next MK_ASYNC_CALL */ + +struct mysql_real_connect_params { + MYSQL *mysql; + const char *host; + const char *user; + const char *passwd; + const char *db; + unsigned int port; + const char *unix_socket; + unsigned long client_flags; +}; +MK_ASYNC_CALLS( + mysql_real_connect, + (MYSQL **ret, MYSQL *mysql, const char *host, const char *user, + const char *passwd, const char *db, unsigned int port, + const char *unix_socket, unsigned long client_flags), + (parms->mysql, parms->host, parms->user, parms->passwd, parms->db, + parms->port, parms->unix_socket, parms->client_flags), <cut> +mysql_close_start(MYSQL *sock) +{ + int res; + + /* It is legitimate to have NULL sock argument, which will do nothing. */ + if (sock) + { + res= mysql_pre_close_start(sock); + /* If we need to block, return now and do the rest in mysql_close_cont(). */ + if (res) + return res; + } + mysql_close(sock); + return 0; +} +int STDCALL +mysql_close_cont(MYSQL *sock, int ready_status) +{ + int res; + + res= mysql_pre_close_cont(sock, ready_status); + if (res) + return res; + mysql_close(sock); + return 0; +} You should use the above mysql_close functions also in client/async_example.cc +#ifdef USE_OLD_FUNCTIONS Forget these! We should remove them soon anyway... <cut> === added file 'tests/async_queries.c' +void +add_query(const char *q) +{ + struct query_entry *e; + char *q2; + size_t len; + + e= malloc(sizeof(*e)); + q2= strdup(q); Would be better if you used my_malloc / my_strdup here. (To get things safemalloc checked). + if (!e || !q2) + fatal(NULL, "Out of memory"); + + /* Remove any trailing newline. */ + len= strlen(q2); + if (q2[len] == '\n') + q2[len--]= '\0'; + if (q2[len] == '\r') + q2[len--]= '\0'; + + e->next= NULL; + e->query= q2; + e->index= query_counter++; + *tail_ptr= e; + tail_ptr= &e->next; +} <cut> === modified file 'vio/viosocket.c' --- vio/viosocket.c 2011-05-14 16:42:07 +0000 +++ vio/viosocket.c 2011-09-20 10:49:25 +0000 @@ -21,6 +21,7 @@ */ #include "vio_priv.h" +#include "my_context.h" int vio_errno(Vio *vio __attribute__((unused))) { @@ -31,18 +32,34 @@ size_t vio_read(Vio * vio, uchar* buf, size_t size) { size_t r; + extern ssize_t my_recv_async(struct mysql_async_context *b, int fd, + unsigned char *buf, size_t size, uint timeout); Move to include file. DBUG_ENTER("vio_read"); DBUG_PRINT("enter", ("sd: %d buf: 0x%lx size: %u", vio->sd, (long) buf, (uint) size)); /* Ensure nobody uses vio_read_buff and vio_read simultaneously */ DBUG_ASSERT(vio->read_end == vio->read_pos); + if (vio->async_context && vio->async_context->active) + r= my_recv_async(vio->async_context, vio->sd, buf, size, vio->read_timeout); + else + { <cut> === modified file 'vio/viossl.c' @@ -21,6 +21,7 @@ */ #include "vio_priv.h" +#include "my_context.h" #ifdef HAVE_OPENSSL @@ -90,11 +91,16 @@ size_t vio_ssl_read(Vio *vio, uchar* buf, size_t size) { size_t r; + extern int my_ssl_read_async(struct mysql_async_context *b, SSL *ssl, + void *buf, int size); Move to extern file (Same for other extern declarations in this file). <cut> Good and intresting work! Regards, Monty

4 9

[Maria-developers] IO statistic in slow log
by jiangchengyao 09 Jan '12

09 Jan '12

Hi, all I write a patch to show physical & logical IO statistics in slow log. Now it only support XtraDB storage engine, but it is easy to realize in other engine. You may found it like this in slow log: # Time: 111227 16:29:54 # User@Host: root[root] @ localhost [::1] # Query_time: 0.310018 Lock_time: 0.203012 Rows_sent: 1 Rows_examined: 30000 Logical_IO: 30145 Physical_IO: 50 use tpcc; SET timestamp=1324974594; select count(1) from history; I think this feature is much helpful for DBA or Developer to know what the real IO one SQL has. In addition, it is simple, only a few changes should be made. The branch is: https://code.launchpad.net/~jiangchengyao/+junk/mariadb Regards, David 2011-12-30 jiangchengyao

3 2

Re: [Maria-developers] [Commits] Rev 3209: Fix sys_vars test suite for 32bit systems. (MDEV-53 & MDEV-53) in file:///home/bell/maria/bzr/work-maria-5.5-sysvar/
by Sergei Golubchik 09 Jan '12

09 Jan '12

Hi, sanja! On Jan 09, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.5-sysvar/ > > ------------------------------------------------------------ > revno: 3209 > revision-id: sanja(a)montyprogram.com-20120109130202-vqvmsk5eqzo1kgv1 > parent: sergii(a)pisem.net-20120107190155-xral93617o3pzp8u > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.5-sysvar > timestamp: Mon 2012-01-09 15:02:02 +0200 > message: > Fix sys_vars test suite for 32bit systems. (MDEV-53 & MDEV-53) Ok to push! Regards, Sergei

1 0

[Maria-developers] Please review: [Commits] Rev 3377: BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate
by Sergei Petrunia 09 Jan '12

09 Jan '12

Hello Igor, Timour Could anybody of please review the below fix? additional details about the problem were posted at https://mariadb.atlassian.net/browse/MDEV-67. ----- Forwarded message from Sergey Petrunya <psergey(a)askmonty.org> ----- From: Sergey Petrunya <psergey(a)askmonty.org> To: commits(a)mariadb.org X-Mailer: mail (GNU Mailutils 1.2) Date: Sun, 8 Jan 2012 14:43:17 +0400 (GST) Subject: [Commits] Rev 3377: BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate ... in file:///home/psergey/dev2/5.3-look46/ At file:///home/psergey/dev2/5.3-look46/ ------------------------------------------------------------ revno: 3377 revision-id: psergey(a)askmonty.org-20120108104314-xa6cxdbfive3elwf parent: igor(a)askmonty.org-20120103040636-nc6o55vsxqadd1n0 committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: 5.3-look46 timestamp: Sun 2012-01-08 14:43:14 +0400 message: BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate ... - Create/use do_copy_nullable_row_to_notnull() function for ref access, which is used when copying from not-NULL field in table that can be NULL-complemented to not-NULL field. === modified file 'mysql-test/r/subselect_sj.result' --- a/mysql-test/r/subselect_sj.result 2011-12-24 16:55:10 +0000 +++ b/mysql-test/r/subselect_sj.result 2012-01-08 10:43:14 +0000 @@ -2152,4 +2152,21 @@ set optimizer_prune_level= @opl_901399; set optimizer_switch= @os_091399; DROP TABLE t1,t2; +# +# BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate ... +# +CREATE TABLE t1 ( a VARCHAR(1) NOT NULL ); +INSERT INTO t1 VALUES ('k'),('l'); +CREATE TABLE t2 ( b VARCHAR(1) NOT NULL, KEY(b) ); +INSERT INTO t2 VALUES ('k'),('l'); +CREATE TABLE t3 ( c VARCHAR(1) NOT NULL, KEY(c) ); +INSERT INTO t3 VALUES ('m'),('n'); +SELECT a, COUNT(*) FROM t1 +WHERE a IN ( +SELECT b FROM t2 force index(b), t3 force index(c) +WHERE c = b AND b = a +); +a COUNT(*) +NULL 0 +DROP TABLE t1, t2, t3; set optimizer_switch=@subselect_sj_tmp; === modified file 'mysql-test/r/subselect_sj_jcl6.result' --- a/mysql-test/r/subselect_sj_jcl6.result 2011-12-24 16:55:10 +0000 +++ b/mysql-test/r/subselect_sj_jcl6.result 2012-01-08 10:43:14 +0000 @@ -2166,6 +2166,23 @@ set optimizer_prune_level= @opl_901399; set optimizer_switch= @os_091399; DROP TABLE t1,t2; +# +# BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate ... +# +CREATE TABLE t1 ( a VARCHAR(1) NOT NULL ); +INSERT INTO t1 VALUES ('k'),('l'); +CREATE TABLE t2 ( b VARCHAR(1) NOT NULL, KEY(b) ); +INSERT INTO t2 VALUES ('k'),('l'); +CREATE TABLE t3 ( c VARCHAR(1) NOT NULL, KEY(c) ); +INSERT INTO t3 VALUES ('m'),('n'); +SELECT a, COUNT(*) FROM t1 +WHERE a IN ( +SELECT b FROM t2 force index(b), t3 force index(c) +WHERE c = b AND b = a +); +a COUNT(*) +NULL 0 +DROP TABLE t1, t2, t3; set optimizer_switch=@subselect_sj_tmp; # # BUG#49129: Wrong result with IN-subquery with join_cache_level=6 and firstmatch=off === modified file 'mysql-test/t/subselect_sj.test' --- a/mysql-test/t/subselect_sj.test 2011-12-24 16:55:10 +0000 +++ b/mysql-test/t/subselect_sj.test 2012-01-08 10:43:14 +0000 @@ -1997,6 +1997,25 @@ DROP TABLE t1,t2; +--echo # +--echo # BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggregate ... +--echo # +CREATE TABLE t1 ( a VARCHAR(1) NOT NULL ); +INSERT INTO t1 VALUES ('k'),('l'); + +CREATE TABLE t2 ( b VARCHAR(1) NOT NULL, KEY(b) ); +INSERT INTO t2 VALUES ('k'),('l'); + +CREATE TABLE t3 ( c VARCHAR(1) NOT NULL, KEY(c) ); +INSERT INTO t3 VALUES ('m'),('n'); + +SELECT a, COUNT(*) FROM t1 + WHERE a IN ( + SELECT b FROM t2 force index(b), t3 force index(c) + WHERE c = b AND b = a + ); + +DROP TABLE t1, t2, t3; # The following command must be the last one the file set optimizer_switch=@subselect_sj_tmp; === modified file 'sql/field_conv.cc' --- a/sql/field_conv.cc 2011-12-11 09:34:44 +0000 +++ b/sql/field_conv.cc 2012-01-08 10:43:14 +0000 @@ -248,6 +248,25 @@ } } +/* + Copy: (not-NULL field in table that can be NULL-complemented) -> (not-NULL + field) +*/ +static void do_copy_nullable_row_to_notnull(Copy_field *copy) +{ + if (*copy->null_row || + (copy->from_null_ptr && (*copy->from_null_ptr & copy->from_bit))) + { + copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, + WARN_DATA_TRUNCATED, 1); + copy->to_field->reset(); + } + else + { + (copy->do_copy2)(copy); + } + +} /* Copy: (NULL-able field) -> (not NULL-able field) */ static void do_copy_not_null(Copy_field *copy) @@ -638,7 +657,15 @@ else if (to_field == to_field->table->next_number_field) do_copy= do_copy_next_number; else - do_copy= do_copy_not_null; + { + if (!from_null_ptr) + { + null_row= &from->table->null_row; + do_copy= do_copy_nullable_row_to_notnull; + } + else + do_copy= do_copy_not_null; + } } } else if (to_field->real_maybe_null()) === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2011-12-24 16:55:10 +0000 +++ b/sql/sql_select.cc 2012-01-08 10:43:14 +0000 @@ -646,6 +646,9 @@ aggregate functions and non-aggregate fields, any non-aggregated field may produce a NULL value. Set all fields of each table as nullable before semantic analysis to take into account this change of nullability. + + Note: this loop doesn't touch tables inside merged semi-joins, because + subquery-to-semijoin conversion has not been done yet. This is intended. */ if (mixed_implicit_grouping) tbl->table->maybe_null= 1; _______________________________________________ commits mailing list commits(a)mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits ----- End forwarded message ----- -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] [Commits] Rev 3204: Fix some failing tests on Windows in file:///H:/bzr/5.5/
by Sergei Golubchik 06 Jan '12

06 Jan '12

Hi, Vladislav! On Jan 06, Vladislav Vaintroub wrote: > - disable perfschema all_instances test on Windows- there are > legitimate reasons for output to be different on Unix (some > different threads, some different locks), the differences are > expected to grow in the future, e.g with threadpool. 1. Why is it not an issue for vanilla MySQL? 2. please don't forget to close all related issues after you fix them :) Regards, Sergei

2 1

[Maria-developers] 回复: Re: IO statistic in slow log
by jiangchengyao 05 Jan '12

05 Jan '12

Yes, Logical IO means pages from buffer pool, physical IO means pages read from disk 2012-01-05 jiangchengyao 发件人：MARK CALLAGHAN 发送时间：2012-01-05 04:39 主题：Re: [Maria-developers] IO statistic in slow log 收件人：jiangchengyao 抄送：maria-developers What are the difference between logical and physical IO? I assume you are using Oracle's terminology where a logical IO means that a page was read from the InnoDB buffer cache. On Thu, Dec 29, 2011 at 6:41 PM, jiangchengyao <jiangchengyao(a)gmail.com> wrote: > Hi, all > > I write a patch to show physical & logical IO statistics in slow log. Now it > only support XtraDB storage engine, but it is easy to realize in other > engine. You may found it like this in slow log: > > # Time: 111227 16:29:54 > # User@Host: root[root] @ localhost [::1] > # Query_time: 0.310018 Lock_time: 0.203012 Rows_sent: 1 Rows_examined: > 30000 Logical_IO: 30145 Physical_IO: 50 > use tpcc; > SET timestamp=1324974594; > select count(1) from history; > > I think this feature is much helpful for DBA or Developer to know what the > real IO one SQL has. In addition, it is simple, only a few changes should be > made. > > The branch is: https://code.launchpad.net/~jiangchengyao/+junk/mariadb > > Regards, > David > > 2011-12-30 > ________________________________ > jiangchengyao > > _______________________________________________ > Mailing list: https://launchpad.net/~maria-developers > Post to : maria-developers(a)lists.launchpad.net > Unsubscribe : https://launchpad.net/~maria-developers > More help : https://help.launchpad.net/ListHelp > -- Mark Callaghan mdcallag(a)gmail.com

1 0

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 04 Jan '12

04 Jan '12

Start with it in the current development branch. If I am not able to backport that then we can talk again. On Tue, Jan 3, 2012 at 1:33 AM, Timour Katchaounov <timour(a)montyprogram.com> wrote: > Mark, > > There is one thing we didn't specify - in which MariaDB version > do you want the feature? If you want just a patch, then it could > be in any version, but if you'd like it to be in a released version, > then it should be in 5.5. > > If you want it to be both in an older version, and in 5.5, then > there will be slight differences IMO because in 5.3 there are few > new join algorithms, and the related code has changed. > > Timour > > > On 23.12.2011 06:38, MARK CALLAGHAN wrote: >> >> Yes, I don't think it is a lot of work. I started on it myself but >> don't trust myself to modify optimizer code. I think we can find a >> bigger project to collaborate on in 2012 -- probably something related >> to replication. >> >> On Wed, Dec 21, 2011 at 12:57 PM, Michael Widenius<monty(a)askmonty.org> >> wrote: >>> >>> >>> Hi! >>> >>>>>>>> "MARK" == MARK CALLAGHAN<mdcallag(a)gmail.com> writes: >>> >>> >>> MARK> A warning would be excellent. An error would be a problem. >>> Returning >>> MARK> OK is probably not the best result when the examined limit is >>> reached. >>> >>> Ok, we will try to develop this feature (with a ok + warning) this year. >>> (Should not be that many hours of work). >>> >>> Regards, >>> Monty >> >> >> >> > -- Mark Callaghan mdcallag(a)gmail.com

1 0

[Maria-developers] WL#248 New (by Igor): Collect engine independent statistics on table columns and indexes to store it in persistent system tables
by worklog-noreply＠askmonty.org 04 Jan '12

04 Jan '12

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Collect engine independent statistics on table columns and indexes to store it in persistent system tables CREATION DATE..: Wed, 04 Jan 2012, 04:11 SUPERVISOR.....: IMPLEMENTOR....: Igor COPIES TO......: Igor Knielsen Monty Psergey Sanja Sergei Timour Wlad CATEGORY.......: Server-BackLog TASK ID........: 248 (http://askmonty.org/worklog/?tid=248) VERSION........: Server-5.5 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 120 (hours remain) ORIG. ESTIMATE.: 120 PROGRESS NOTES: DESCRIPTION: In a special mode the ANALYZE command will collect statistics on table cardinality, table columns and table indexes. This statistics will be stored in system tables table_stat, column_stat and index_stat. For any database table the system table table_stat will contain the number of rows in the table. For any table column the system table column_stat will contain min and max value, the share of null values, the average length of a column value, and the the average frequency of the column values. For any index defined on a database table the system table index_stat will contain number of records per every key prefix. This task will be implemented in 3 steps: 1. A pure back-port of the WL#4777 from mysql-5.4 code line will be performed. 2. New possibility to collect statistics only on specified columns and/or indexes will be added. 3. A new possibility to scan only a certain percentage of the table records in a pseudo-random manner will be added. The collected statistics is supposed to be used by the optimizer, but this will be an objective of some other task. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] [Commits] Rev 3376: Fixed LP bug #910083. in file:///home/igor/maria/maria-5.3-bug910083/
by Igor Babaev 03 Jan '12

03 Jan '12

On 01/03/2012 06:44 AM, Timour Katchaounov wrote: > Igor, > >> On 01/03/2012 12:49 AM, Timour Katchaounov wrote: >>> Hi Igor, >>> >>> The reason for removing this specific call to >>> engine->set_thd() was because Monty claimed this is >>> the correct way, and because with the new assert we >>> couldn't find any case where the new assert would fail. >>> >>> Apparently the above assert was incorrect, however, the >>> current commit message doesn't have any explanation what >>> was wrong, why the assert you removed is wrong, and why >>> it is needed to call engine->set_thd(). >> >> Igor, >> >> I would rather say that you patch did not have any explanation >> why you had removed the call. Should it be a reference to Monty's >> opinion?I have to admit it would be pretty pretty lame. > > There is a comment in the patch for bug lp:685411, this is the > relevant diff: > > @@ -183,7 +185,8 @@ bool Item_subselect::fix_fields(THD *thd > bool res; > > DBUG_ASSERT(fixed == 0); > - engine->set_thd((thd= thd_param)); > + /* There is no reason to get a different THD. */ > + DBUG_ASSERT(thd == thd_param); > if (!done_first_fix_fields) > { > done_first_fix_fields= TRUE; > > The reasoning is simple - there is no reason for a subquery to > get a different THD object compared to that of the containing > query. > > So my question to your patch is whether you figured out why the > above assumption is not true. If you did, it would be nice to have > an explanation. I am pretty sure the assumption is true for SELECTs. > If that is the case, then I would refine your fix by testing whether > a statement is a SELECT, or UPDATE (or INSERT?) and updating the THD > only when needed. It's relevant for the scenario when the fixed item is created by a different client: for example, when the item belongs to SP and this SP was created by a different client. I returned the code that you removed. I don't think I have to explain why you were wrong. > > Timour > >> >> Regards, >> Igor. >> >>> >>> Timour >>> >>> On 3.01.2012 06:06, Igor Babaev wrote: >>>> At file:///home/igor/maria/maria-5.3-bug910083/ >>>> >>>> ------------------------------------------------------------ >>>> revno: 3376 >>>> revision-id: igor(a)askmonty.org-20120103040636-nc6o55vsxqadd1n0 >>>> parent: psergey(a)askmonty.org-20111230211905-he458ysn3sse6wlm >>>> committer: Igor Babaev<igor(a)askmonty.org> >>>> branch nick: maria-5.3-bug910083 >>>> timestamp: Mon 2012-01-02 20:06:36 -0800 >>>> message: >>>> Fixed LP bug #910083. >>>> The patch for bug 685411 erroneously removed a call of >>>> engine->set_thd() >>>> from Item_subselect::fix_fields(). >>>> >>>> >>>> >>>> _______________________________________________ >>>> commits mailing list >>>> commits(a)mariadb.org >>>> https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits >>

1 0

Re: [Maria-developers] [Commits] Rev 3376: Fixed LP bug #910083. in file:///home/igor/maria/maria-5.3-bug910083/
by Igor Babaev 03 Jan '12

03 Jan '12

On 01/03/2012 12:49 AM, Timour Katchaounov wrote: > Hi Igor, > > The reason for removing this specific call to > engine->set_thd() was because Monty claimed this is > the correct way, and because with the new assert we > couldn't find any case where the new assert would fail. > > Apparently the above assert was incorrect, however, the > current commit message doesn't have any explanation what > was wrong, why the assert you removed is wrong, and why > it is needed to call engine->set_thd(). Igor, I would rather say that you patch did not have any explanation why you had removed the call. Should it be a reference to Monty's opinion?I have to admit it would be pretty pretty lame. Regards, Igor. > > Timour > > On 3.01.2012 06:06, Igor Babaev wrote: >> At file:///home/igor/maria/maria-5.3-bug910083/ >> >> ------------------------------------------------------------ >> revno: 3376 >> revision-id: igor(a)askmonty.org-20120103040636-nc6o55vsxqadd1n0 >> parent: psergey(a)askmonty.org-20111230211905-he458ysn3sse6wlm >> committer: Igor Babaev<igor(a)askmonty.org> >> branch nick: maria-5.3-bug910083 >> timestamp: Mon 2012-01-02 20:06:36 -0800 >> message: >> Fixed LP bug #910083. >> The patch for bug 685411 erroneously removed a call of >> engine->set_thd() >> from Item_subselect::fix_fields(). >> >> >> >> _______________________________________________ >> commits mailing list >> commits(a)mariadb.org >> https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0

Re: [Maria-developers] [Commits] Rev 3202: Fix compile error in file:///H:/bzr/5.5/
by Sergei Golubchik 03 Jan '12

03 Jan '12

Hi, Vladislav! What was the error that you fixed? On Jan 03, Vladislav Vaintroub wrote: > ------------------------------------------------------------ > revno: 3202 > committer: Vladislav Vaintroub <wlad(a)montyprogram.com> > branch nick: 5.5 > timestamp: Tue 2012-01-03 00:17:36 +0100 > message: > Fix compile error > === modified file 'storage/maria/ma_write.c' > --- a/storage/maria/ma_write.c 2012-01-02 20:56:16 +0000 > +++ b/storage/maria/ma_write.c 2012-01-02 23:17:36 +0000 > @@ -472,10 +472,11 @@ > int error; > my_off_t new_root= *root; > uchar key_buff[MARIA_MAX_KEY_BUFF]; > - MARIA_KEY UNINIT_VAR(org_key); /* Set/used when now_transactional=TRUE */ > + MARIA_KEY org_key; /* Set/used when now_transactional=TRUE */ > + my_bool transactional= share->now_transactional; > DBUG_ENTER("_ma_ck_write_btree_with_log"); > > - if (share->now_transactional) > + if (transactional) > { > /* Save original value as the key may change */ > org_key= *key; > @@ -483,7 +484,7 @@ > } > > error= _ma_ck_real_write_btree(info, key, &new_root, comp_flag); > - if (!error && share->now_transactional) > + if (!error && transactional) > { > /* Log the original value */ > *key= org_key; > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits Regards, Sergei

2 1

[Maria-developers] win auth plugin
by sergii＠pisem.net 31 Dec '11

31 Dec '11

Hi. Attached is the patch for the windows authentication plugin. To avoid code duplication I've reused MySQL's windows authentication plugin and only wrote the server part. This plugin is different from MySQL's, because (as all our plugins) it does not do user name mapping and only preforms the authentication - that is, only verifies that the user really is who he says he is. Regards, Sergei

3 3

[Maria-developers] WL#247 New (by Igor): Make the optimizer use extended keys
by worklog-noreply＠askmonty.org 31 Dec '11

31 Dec '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Make the optimizer use extended keys CREATION DATE..: Sat, 31 Dec 2011, 05:49 SUPERVISOR.....: IMPLEMENTOR....: Igor COPIES TO......: Igor Monty Psergey Sanja Sergei Timour CATEGORY.......: Server-BackLog TASK ID........: 247 (http://askmonty.org/worklog/?tid=247) VERSION........: Server-5.5 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 60 (hours remain) ORIG. ESTIMATE.: 60 PROGRESS NOTES: DESCRIPTION: Currently the optimizer mostly does not use hidden components of InnoDB keys. Meanwhile these components contain fields of the primary key and could be used to to generate more efficient execution plans. In particular using these components in many cases allow to generate execution plans that that employs index only look-ups. This task will support usage of extended keys for: - ref and eq-ref accesses - range scans - index-merge scans - loose scans - min/max optimization ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] Problems with packages in 5.3 buildbot
by Kristian Nielsen 30 Dec '11

30 Dec '11

I learned that there were many test failures with packages in 5.3. I think it may be due to the version in configure.in not being increased after last release. I pushed a commit that changes it to 5.3.4-rc, we will see if it helps. - Kristian.

1 0

Re: [Maria-developers] License issues
by Henrik Ingo 30 Dec '11

30 Dec '11

I'm assuming you left out the list in accident and won't mind that I quote you a little: On Thu, Dec 29, 2011 at 10:22 PM, Sergei Golubchik <serg(a)askmonty.org> wrote: > On Dec 29, Henrik Ingo wrote: >> (I'm pretty sure readline developers didn't quite realize what they >> were doing here. Their original goal with their choice of license was >> to create an advantage for GPL licensed apps, now they are doing >> exactly the opposite.) > > I think it was intentional. > > readline is a gnu project, hosted on gnu.org. > It looks like an FSF policy to use GPLv3. Other gnu software than I've > checked is also on GPLv3 (in particular, libbfd - that is used by > binutils, gdb, etc - so it's kind of fundamental for development chain). Yes, I'm aware of this. However, most FSF *libraries* are licensed LGPL. Only readline and a few others (apparently then libbfd, if you say so) are GPL. The purpose of this is to make those libraries exclusively available to GPL software, or also compatible FOSS software. (eg. a BSD licensed application could use a GPL licensed library as long as source code of the app is in fact made available.) > I might be wrong, but I think using GPLv3 for all (or most) GNU > projects, including essencial libraries, is quite intentional. Well, it is intentional for FSF in the sense that it is policy. For the libraries that use LGPL it is also quite fine to force everyone to use them under LGPLv3, as it won't have similar bad effects on the apps that use those libraries. However, in the case of readline and other libraries that are GPL, this has the effect of hurting projects that are GPLv2 only, while it in fact improves the situation for non-copyleft projects such as those under Apache license. (Apache license is considered by FSF to be incompatible with GPLv2 but compatible with GPLv3.) I very much doubt that this particular consequence was intentional. To support GPL licensed software, the FSF should in this case have licensed readline as both GPLv2 and GPLv3. henrik -- henrik.ingo(a)avoinelama.fi +358-40-8211286 skype: henrik.ingo irc: hingo www.openlife.cc My LinkedIn profile: http://www.linkedin.com/profile/view?id=9522559

2 1

[Maria-developers] License issues
by Maarten Vanraes 30 Dec '11

30 Dec '11

Hi, I'm a packager for mageia, and i'm working to get branch 5.5 submitted on our system, replacing mysql. However, we have readline v6 on mageia, which is GPLv3, and serg added the NOT_FOR_DISTRIBUTION variable, which makes it build a bundled readline v5. well, it builds for us too, but later i get a conflict situation on our system between mariadb-common and mariadb-client (i didn't look deep into it). but normally we try to use as much system shared libraries as possible, also, what about security fixes + bug fixes in this bundled readline v5, etc... i donno how long v5 will be maintained by gnu, this is not an ideal situation. i've checked and noted that mariadb server is GPLv2only and mariadb client has a FLOSS exception... which doesn't mention GPLv3 so i'm a bit at a loss here, ideally we want to use system shared readline v6 on our distribution... it's a bit of a PITA for me, tbh, i mean, it's all open source, i don't really get why this is all so difficult... :-( I guess the easiest way for us is if mariadb was GPLv2+ we could go ahead and use readline v6. I guess i'm asking for a way to proceed for us. Regards, AL13N

4 6

Re: [Maria-developers] [Commits] Rev 3077: Fixed LP bug #904345. in file:///home/igor/maria/maria-5.2-bug904345/
by Oleksandr Byelkin 27 Dec '11

27 Dec '11

Hi! 27.12.2011 20:46, Igor Babaev пишет: > At file:///home/igor/maria/maria-5.2-bug904345/ > > ------------------------------------------------------------ > revno: 3077 > revision-id: igor(a)askmonty.org-20111227184559-v7hlo1h98dz8ui32 > parent: wlad(a)montyprogram.com-20111223140257-k34gmwhs5msbc57k > committer: Igor Babaev<igor(a)askmonty.org> > branch nick: maria-5.2-bug904345 > timestamp: Tue 2011-12-27 10:45:59 -0800 > message: > Fixed LP bug #904345. > > The MIN/MAX optimizer code from the function opt_sum_query erroneously > did not take into account conjunctive conditions that did not depend on > any table, yet were not identified as constant items. These could be > items containing rand() or PS/SP parameters. These items are supposed > to be evaluated at the execution phase. That's why if such conditions > can be extracted from the WHERE condition the MIN/MAX optimization is > not applied as currently it is always done at the optimization phase. > > (In 5.3 expensive subqueries are also evaluated only at the execution > phase. So, if a constant condition with such subquery can be extracted > from the WHERE clause the MIN/MAX optimization should not be applied > in 5.3.) > > IF an IN/ALL/SOME predicate with a constant left part is transformed > into an EXISTS subquery the resulting subquery should not be considered > uncacheable if the right part of the predicate is not uncacheable. > > Backported the function dbug_print_item() from 5.3. The function is used > only for debugging. [skip] > === modified file 'sql/item.cc' > --- a/sql/item.cc 2011-11-24 16:48:58 +0000 > +++ b/sql/item.cc 2011-12-27 18:45:59 +0000 > @@ -7915,6 +7915,22 @@ > ((TABLE_LIST *)data)->hide_view_error(thd); > } > > +/* Debugger help function */ > +static char dbug_item_print_buf[256]; > + > +const char *dbug_print_item(Item *item) > +{ > + char *buf= dbug_item_print_buf; > + String str(buf, sizeof(dbug_item_print_buf),&my_charset_bin); > + str.length(0); > + if (!item) > + return "(Item*)NULL"; > + item->print(&str ,QT_ORDINARY); > + if (str.c_ptr() == buf) > + return buf; > + else > + return "Couldn't fit into buffer"; > +} This should be put under #ifndef DBUG_OFF Everything else looks OK to be pushed. [skip]

1 0

Re: [Maria-developers] [Commits] Rev 3170: After-merge fixes for 5.5 merge. in http://bazaar.launchpad.net/~maria-captains/maria/5.5
by Kristian Nielsen 27 Dec '11

27 Dec '11

Hi Monty, While fixing test failures in the MariaDB 5.5 tree, I encountered problems in sql_string, related to changes you did there in 5.2. I managed to come up with some solution, but please see below patch and see if you can suggest something better. Two issues: 1. You added realloc_with_extra() / realloc_with_extra_if_needed(), and used them to replace calls to realloc(). But realloc() as part of its operation puts a terminating '\0' at the end of the allocation; with your change this is now at a different (and not very useful) position in the buffer. My change tries to put it in the original place, but it is not terribly elegant, and perhaps your original change needs to be rethought. 2. I found a terrible mess (IMHO): We have two distict, subtly differing, sql_string.{h,cc}, one in /sql/ and one in /client/. We even seem to have a requirement for ABI compatibility between the two, since mysql_embedded uses client/sql_string.h with sql/sql_string.cc :-( And in fact your change seems to break such ABI compatibility, so I suspect mysql_embedded might be subtly broken in 5.2. But why do we need to have two sql_string in the first place? Especially given that they are apparently sufficiently close to be ABI compatible ... can't we eliminate on of them to get at least a little sanity into the sql_string story? - Kristian. knielsen(a)knielsen-hq.org writes: > At http://bazaar.launchpad.net/~maria-captains/maria/5.5 > > ------------------------------------------------------------ > revno: 3170 > revision-id: knielsen(a)knielsen-hq.org-20111209144027-yf5as4v9lb6jt3s7 > parent: knielsen(a)knielsen-hq.org-20111208170848-pijq4i8ceqwcl19q > committer: knielsen(a)knielsen-hq.org > branch nick: mariadb-5.5 > timestamp: Fri 2011-12-09 15:40:27 +0100 > message: > After-merge fixes for 5.5 merge. > > Fix typo causing too low timeout value for wait_for_slave_param.inc. > Fix wrong/missing '\0' termination in String:realloc() after Monty's > optimisations to reduce reallocation calls. > === modified file 'mysql-test/include/wait_for_slave_param.inc' > --- a/mysql-test/include/wait_for_slave_param.inc 2010-12-20 14:15:01 +0000 > +++ b/mysql-test/include/wait_for_slave_param.inc 2011-12-09 14:40:27 +0000 > @@ -79,7 +79,7 @@ if ($_slave_check_configured == 'No such > > # mysqltest doesn't provide any better way to multiply by 10 > --let $_wait_for_slave_param_zero= 0 > ---let $_slave_timeout_counter= $_slave_timeout$zero > +--let $_slave_timeout_counter= $_slave_timeout$_wait_for_slave_param_zero > --let $_slave_continue= 1 > while ($_slave_continue) > { > > === modified file 'sql/rpl_handler.cc' > --- a/sql/rpl_handler.cc 2011-11-03 18:17:05 +0000 > +++ b/sql/rpl_handler.cc 2011-12-09 14:40:27 +0000 > @@ -397,7 +397,7 @@ int Binlog_transmit_delegate::before_sen > > int ret= 0; > FOREACH_OBSERVER(ret, before_send_event, thd, > - (&param, (uchar *)packet->c_ptr(), > + (&param, (uchar *)packet->c_ptr_safe(), > packet->length(), > log_file+dirname_length(log_file), log_pos)); > return ret; > @@ -411,7 +411,7 @@ int Binlog_transmit_delegate::after_send > > int ret= 0; > FOREACH_OBSERVER(ret, after_send_event, thd, > - (&param, packet->c_ptr(), packet->length())); > + (&param, packet->c_ptr_safe(), packet->length())); > return ret; > } > > > === modified file 'sql/sql_string.cc' > --- a/sql/sql_string.cc 2011-11-03 18:17:05 +0000 > +++ b/sql/sql_string.cc 2011-12-09 14:40:27 +0000 > @@ -80,8 +80,12 @@ bool String::real_alloc(uint32 length) > no allocation occured. > > @retval true An error occured when attempting to allocate memory. > + > + The _internal() version is just to share code between realloc() and > + realloc_with_extra(), so that we can put the NULL termination at the right > + position. > */ > -bool String::realloc(uint32 alloc_length) > +bool String::realloc_internal(uint32 alloc_length) > { > if (Alloced_length <= alloc_length) > { > @@ -109,6 +113,13 @@ bool String::realloc(uint32 alloc_length > Ptr= new_ptr; > Alloced_length= len; > } > + return FALSE; > +} > + > +bool String::realloc(uint32 alloc_length) > +{ > + if (realloc_internal(alloc_length)) > + return TRUE; > Ptr[alloc_length]=0; // This make other funcs shorter > return FALSE; > } > > === modified file 'sql/sql_string.h' > --- a/sql/sql_string.h 2011-11-03 18:17:05 +0000 > +++ b/sql/sql_string.h 2011-12-09 14:40:27 +0000 > @@ -255,12 +255,18 @@ public: > return real_alloc(arg_length); > } > bool real_alloc(uint32 arg_length); // Empties old string > +private: > + bool realloc_internal(uint32 arg_length); > +public: > bool realloc(uint32 arg_length); > bool realloc_with_extra(uint32 arg_length) > { > if (extra_alloc < 4096) > extra_alloc= extra_alloc*2+128; > - return realloc(arg_length + extra_alloc); > + if (realloc_internal(arg_length + extra_alloc)) > + return TRUE; > + Ptr[arg_length]= 0; > + return FALSE; > } > bool realloc_with_extra_if_needed(uint32 arg_length) > { > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

3 2

[Maria-developers] Thread pool (request for review)
by Vladislav Vaintroub 27 Dec '11

27 Dec '11

Hello, Worklog#246 http://askmonty.org/worklog/Server-BackLog/?tid=246 is ready to review. The worklog is implemented in lp:~maria-captains/maria/5.5-threadpool, and if someone prefers to have a one big diff, it is in the attachment(diff.diff) It would be great if Monty, Serg (optionally Kristian if there is interest) could take a some time to review it in the near future. The worklog has extensive description of the implementation, might be helpful to consult it before reviewing. The branch currently has thread-handling=pool-if-threads as default, I found it easier for testing. Based on results of benchmark (see below), it seems to be generally performing well. So maybe we should use it as default, beta version of 5.5 for better testing coverage . Maybe we can keep it as new default after testing default, if there are no complains. Benchmarking: I also run some sysbench on 3 machines (2 Linuxes - fb-maria1 with 16 cores and pitbull with 24 cores, and windows one with 8 cores but good IO), results in https://docs.google.com/spreadsheet/ccc?key=0AqvHLyfRWjmbdDY0U1MzZGlXY3VGdUx xcC1pUlBZeHc I used sysbench 0.4 to run some of "unit" oltp tests (point-select and update-nokey), as well as mere "classic" OLTP-readonly and OLTP-readwrite. All tests are run with number of concurrent clients ranging from 16 to 4096, with warm cache, with sysbench table having 1Mio records. The results seem to be quite different on all of the machines tested (the machines are very different, in terms of cores, IO etc) , yet threadpool has a positive effect on all 3 machines, and the positive effect seems to grow with the number of cores. Some words about how I ran the benchmarks 1. Benchmark client and server used different CPUs - (I used 'taskset' (Linux), or 'start /affinity' (Windows) to run benchmark client on #CPUs/4, the rest of CPUs are used by the server). On Linuxes, I used --thread_pool_size=<N> where N is number of cores I dedicate to server. 2.I used innodb_flush_log_at_trx_commit=0 and innodb_flush_method= ALL_O_DIRECT to avoid extensive fsyncing, which I think is ok for the purposes of the testing for this WL. 3. Every "write" benchmark (oltp_rw and update_nokey) started with new server (i.e I kill mysqld, remove innodb files, and restart mysqld for each test),whereas every "read" benchmark reused the same running server instance. Starting afresh with a new server on write benchmarks is done mailnly to eliminate the effects of the purge lag. I attach config file sysbench.ini is the one I used on fb-maria1 In case I missed to say it before, Happy Xmas and Happy New Year! Wlad PS. Elena, we need to have some plan on testing it. PPS. Kristian, tried to integrate the 5.5-threadpool branch into Buildbot, and stuck. Can you help?

2 2

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 23 Dec '11

23 Dec '11

A warning would be excellent. An error would be a problem. Returning OK is probably not the best result when the examined limit is reached. On Wed, Dec 21, 2011 at 7:17 AM, Timour Katchaounov <timour(a)montyprogram.com> wrote: >> >> Hi! >> >>>>>>> "MARK" == MARK CALLAGHAN<mdcallag(a)gmail.com> writes: >> >> >> MARK> I want a variant of the LIMIT clause that limits the number of rows >> MARK> examined during SELECT processing. This should return OK when the >> MARK> limit is reached -- something like NESTED_LOOP_QUERY_LIMIT. While >> MARK> LIMIT can be LIMIT x and LIMIT x,y. This only supports one argument >> -- >> MARK> LIMIT_ROWS_EXAMINED x. Are you interested in implementing this >> feature >> MARK> for me? We will sponsor the work. The purpose of the feature is to >> MARK> prevent queries from taking too long when there isn't a great index >> MARK> and many rows might be filtered. >> >> I am a bit afraid of returning 'ok'. Would it not be better to return >> an error? >> >> Another option would be to generate a warning so that the application >> can know that they didn't get all rows. > > > This is what I would prefer to do: > - process the new LIMIT_ROWS_EXAMINED clause in the same way as LIMIT, > just with a different condition to end query execution, > - in addition produce a warning that not all rows were returned. > > Mark, does the above suit you? If you don't want to check for > warnings, you can skip them, however users will have the option > to detect that not all rows were returned. > > Timour > >> >> We can do this and it should be relatively easy to do. >> >> Regards, >> Monty >> >> _______________________________________________ >> Mailing list: https://launchpad.net/~maria-developers >> Post to : maria-developers(a)lists.launchpad.net >> Unsubscribe : https://launchpad.net/~maria-developers >> More help : https://help.launchpad.net/ListHelp -- Mark Callaghan mdcallag(a)gmail.com

3 3

[Maria-developers] Fixes for PAM plugin in packages
by Kristian Nielsen 21 Dec '11

21 Dec '11

Hi Serg, As promised, here a summary of what I did to fix PAM in linux packages. I managed to fix most issues I think (except for RHEL5 as noted below), but it needs testing, which takes time due to waiting for Buildbot. - I installed libpam0g-dev in all the VMs for .deb and bintar packages. I checked on one of them that this really does cause pam modules to build and install. - I installed pam-devel on the centos5 VMs. I also tried on the rhel5, but failed. These VMs seem to require some sort of license key or something to install packages with yum, which I don't have. Maybe Daniel can sort it out (all that is needed is `sudo yum install pam-devel` in vm-rhel5-amd64-build.qcow2 and vm-rhel5-x86-build.qcow2). - I hacked .deb packaging scripts (ourdelta scripts) so that dialog.so is in the libmariadbclient16 package (it used to be in the mariadb-server-5.[23] package). I did this for 5.2 and 5.3 (not 5.1). - The dialog.so change could cause an upgrade problem I think - installing new libmariadbclient16 package on top of old mariadb-server-5.[23] package will conflict because they both contain /usr/lib/mysql/plugin/dialog.so. I tried to fix this by declaring a conflicts: dependency which should allow Apt to sort it out. I hope it works - .deb dependencies can be tricky, hopefully buildbot Upgrade tests will catch any problems. - I did not change RPM packages wrt. dialog.so. I don't know if it is needed, nor how to do it... What remains is basically testing. First checking Buildbot when it has chewed through all the builds. It might be a good idea also to test manually a couple packages that the PAM plugin is in there and actually works according to instructions on the knowledgebase. - Kristian.

2 1

[Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 21 Dec '11

21 Dec '11

I want a variant of the LIMIT clause that limits the number of rows examined during SELECT processing. This should return OK when the limit is reached -- something like NESTED_LOOP_QUERY_LIMIT. While LIMIT can be LIMIT x and LIMIT x,y. This only supports one argument -- LIMIT_ROWS_EXAMINED x. Are you interested in implementing this feature for me? We will sponsor the work. The purpose of the feature is to prevent queries from taking too long when there isn't a great index and many rows might be filtered. -- Mark Callaghan mdcallag(a)gmail.com

2 1

Re: [Maria-developers] request for a feature -- LIMIT_ROWS_EXAMINED
by MARK CALLAGHAN 18 Dec '11

18 Dec '11

On Sat, Dec 17, 2011 at 3:18 PM, Timour Katchaounov <timour(a)montyprogram.com> wrote: > Mark, > > >> I want a variant of the LIMIT clause that limits the number of rows >> examined during SELECT processing. This should return OK when the > > > I had a look at the code, and it seems you need a limit on the value > of Rows_examined that is currently available in the slow query log. > Did I understand correctly that this is what you need? yes > > >> limit is reached -- something like NESTED_LOOP_QUERY_LIMIT. While >> LIMIT can be LIMIT x and LIMIT x,y. This only supports one argument -- >> LIMIT_ROWS_EXAMINED x. Are you interested in implementing this feature >> for me? We will sponsor the work. The purpose of the feature is to >> prevent queries from taking too long when there isn't a great index >> and many rows might be filtered. >> > > Have you considered a system variable instead of extending the query > syntax? If you rejected this idea, why? > > It seems quite logical to me that one may want to set the same limit > for more than one query. In this case a system variable would make > life easier, because no queries need to be changed. Personally I > would prefer not to extend the query language with constructs whose > purpose is to compensate for the imperfection of the optimizer. This isn't about limits on the optimizer. We don't have a great index for some queries and never will. We prefer to stop queries early rather than have them examine 1,000,000 rows. Real users might be waiting on the query response so we really need to finish queries fast and in some cases our apps work as expected were queries allowed to terminate early. I almost always prefer to attach the semantics to the statement and that includes this case. Anyone looking at the statement via a log (slow query, general), SHOW PROCESSLIST, tcpdump should be able to understand what the statement does. Making the LIMIT part of a session variable prevents that. I also don't want to risk an additional round trip to the server and for drivers that don't support multi-statement or for limitations on the code that generates the SQL, I don't want to do: set session limit_rows_examined=1000; SELECT /* with rows examined limit */ ... ; set session limit_rows_examined=0; -- Mark Callaghan mdcallag(a)gmail.com

1 0

[Maria-developers] Patch for xtradb compilation on visual studio
by Kristian Nielsen 15 Dec '11

15 Dec '11

Here is a patch for XtraDB (from Percona Server 5.5.17-rel22.1). We needed this in MariaDB 5.5 to compile on Windows. The problem is that this compiler apparently does not like having #ifdef inside macro invocations. I thought Percona might want to include it upstream, in case there are other compilers that also do not like this. - Kristian. === modified file 'storage/innobase/handler/ha_innodb.cc' --- storage/innobase/handler/ha_innodb.cc 2011-12-15 09:34:14 +0000 +++ storage/innobase/handler/ha_innodb.cc 2011-12-15 12:35:48 +0000 @@ -12369,14 +12369,16 @@ static MYSQL_SYSVAR_ULONG(concurrency_ti "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket", NULL, NULL, 500L, 1L, ~0L, 0); -static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, - PLUGIN_VAR_RQCMDARG, #ifdef EXTENDED_FOR_KILLIDLE - "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.", +#define TMP_STR "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB." #else - "No effect for this build.", +#define TMP_STR "No effect for this build." #endif +static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction, + PLUGIN_VAR_RQCMDARG, + TMP_STR, NULL, NULL, 0, 0, LONG_MAX, 0); +#undef TMP_STR static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads, PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,

2 1

Re: [Maria-developers] Please fix: innodb_plugin.innodb_gis fails on 'gcov' builder
by Sergei Petrunia 14 Dec '11

14 Dec '11

Hi Alexey, We have a repeatable failure like this: https://internal.askmonty.org/buildbot/builders/gcov/builds/830/steps/test_… innodb_plugin.innodb_gis w3 [ fail ] Test ended at 2011-12-14 06:52:31 CURRENT_TEST: innodb_plugin.innodb_gis mysqltest: At line 1: query 'SET storage_engine=innodb' failed: 1286: Unknown table engine 'innodb' The result from queries just before the failure was: SET storage_engine=innodb; - saving '/home/buildbot/buildbot_basedir/perpush-gcov/build/mysql-test/var/3/log/innodb_plugin.innodb_gis/' to '/home/buildbot/buildbot_basedir/perpush-gcov/build/mysql-test/var/log/innodb_plugin.innodb_gis/' It's in GIS, so I assume it is on your turf. Could you please fix this? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 2

Re: [Maria-developers] Please do a test of 5.3 with these new @@optimizer_switch settings
by Sergei Petrunia 14 Dec '11

14 Dec '11

Hi Elena, On Thu, Dec 08, 2011 at 06:29:01AM +0400, Elena Stepanova wrote: > I tried to set them run overnight, but it isn't going too well. Most of > tests are crashing, see https://bugs.launchpad.net/maria/+bug/901506 . > This bug is finally fixed and pushed. Could you please run more tests on the fix asap? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Compilation problem on an old 32-bit machine
by Kristian Nielsen 12 Dec '11

12 Dec '11

Hi Paul, It seems a patch is needed for PBXT to build on 32-bit x86 in some cases: Elena Stepanova <elenst(a)montyprogram.com> writes: > lock_xt.h: Assembler messages: > lock_xt.h:70: Error: bad register name `%sil' > After some re-installation and long digging, I found the ancient bug > report http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153 which gets > re-filed regularly, the last time was a few months ago. They say it's > a code problem, and suggest replacing the '=r' constraint with '=q'. I > did so in all 4 lines that gcc complained about, and finally got it > work. It seems correct to me that the "q" constraint must be used rather than "r" for the 8-bit case. Below patch should do it (we will apply this in MariaDB). - Kristian. === modified file 'storage/pbxt/src/lock_xt.h' --- storage/pbxt/src/lock_xt.h 2010-05-06 12:57:15 +0000 +++ storage/pbxt/src/lock_xt.h 2011-12-12 11:34:54 +0000 @@ -67,9 +67,9 @@ inline void xt_atomic_inc1(volatile xtWo #elif defined(XT_ATOMIC_GNUC_X86) xtWord1 val; - asm volatile ("movb %1,%0" : "=r" (val) : "m" (*mptr) : "memory"); + asm volatile ("movb %1,%0" : "=q" (val) : "m" (*mptr) : "memory"); val++; - asm volatile ("xchgb %1,%0" : "=r" (val) : "m" (*mptr), "0" (val) : "memory"); + asm volatile ("xchgb %1,%0" : "=q" (val) : "m" (*mptr), "0" (val) : "memory"); #elif defined(XT_ATOMIC_SOLARIS_LIB) atomic_inc_8(mptr); #else @@ -91,9 +91,9 @@ inline xtWord1 xt_atomic_dec1(volatile x #elif defined(XT_ATOMIC_GNUC_X86) xtWord1 val2; - asm volatile ("movb %1, %0" : "=r" (val) : "m" (*mptr) : "memory"); + asm volatile ("movb %1, %0" : "=q" (val) : "m" (*mptr) : "memory"); val--; - asm volatile ("xchgb %1,%0" : "=r" (val2) : "m" (*mptr), "0" (val) : "memory"); + asm volatile ("xchgb %1,%0" : "=q" (val2) : "m" (*mptr), "0" (val) : "memory"); /* Should work, but compiler makes a mistake? * asm volatile ("xchgb %1, %0" : : "r" (val), "m" (*mptr) : "memory"); */

2 1

Re: [Maria-developers] Please fix: gis-precise crashes on solaris
by Alexey Botchkov 12 Dec '11

12 Dec '11

Hi, Adam. Yes i need the access to the machine. Wasn't able to figure out what's wrong by looking at the traces. The crashing query is probably the most trivial of them all. Regards HF 10.12.2011 15:29, Adam M Dutko wrote: > > Let me know if you need access to the machine and I will coordinate > off-list. > > -Adam > >

1 0

[Maria-developers] WL#246 New (by Wlad): Threadpool
by worklog-noreply＠askmonty.org 09 Dec '11

09 Dec '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Threadpool CREATION DATE..: Fri, 09 Dec 2011, 22:23 SUPERVISOR.....: IMPLEMENTOR....: Wlad COPIES TO......: CATEGORY.......: Server-BackLog TASK ID........: 246 (http://askmonty.org/worklog/?tid=246) VERSION........: Maria-2.0 STATUS.........: In-Progress PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 300 (hours remain) ORIG. ESTIMATE.: 300 PROGRESS NOTES: DESCRIPTION: Implement a dynamic thread pool, which provides good (superior compared to thread-per-connection) performance for short queries and many threads and does not block on on long queries. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] Please fix: gis-precise crashes on solaris
by Sergei Petrunia 09 Dec '11

09 Dec '11

Hi Alexey, I'm looking at 5.3 tree and see main.gis-precise to repeatably crash on solaris: http://buildbot.askmonty.org/buildbot/builders/sol-sparc-32/builds/1518/ste… We don't have a solaris machine but the test failure has a stack trace. Could you please look into this? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Please do a test of 5.3 with these new @@optimizer_switch settings
by Sergei Petrunia 08 Dec '11

08 Dec '11

Hi Elena, We're going to make the following enabled by default: @@optimizer_switch='semijoin_with_cache=on,outer_join_with_cache=on' @@join_cache_level=2 Could you please make a test run with these settings? It is important to test revision>=3337 (just pushed it), because it has a change in the optimizer which makes it choose semijoin+join_cache execution plans much more often. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] WL#245 New (by Sanja): EXISTS to IN transformation
by worklog-noreply＠askmonty.org 07 Dec '11

07 Dec '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: EXISTS to IN transformation CREATION DATE..: Wed, 07 Dec 2011, 12:51 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 245 (http://askmonty.org/worklog/?tid=245) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Transform queries like: ... WHERE EXISTS (SELECT 1 FROM inner_table WHERE inner_table.field = 2*outer_table.field AND maybe_something_else)... and ... WHERE NOT EXISTS (SELECT 1 FROM inner_table WHERE inner_table.field = 2*outer_table.field AND maybe_something_else)... into ... WHERE 2*outer_table.field IN (SELECT inner_table.field FROM inner_table WHERE 1 = 1 AND maybe_something_else).. ... WHERE 2*outer_table.field IS NULL OR 2*outer_table.field IN (SELECT inner_table.field FROM inner_table WHERE inner_table.field IS NOT NULL AND maybe_something_else).. To allow optimizations made for IN/ALL/ANY subqueries. Conversion is possible only if: 1)real NULL is not important (top element of WHERE/ON AND/OR list, i.e. NULL equal to FALSE) 2)the subquery has the only dependence which we bring out of it 3)the subquery is simple (has no aggregate function, GROUp BY, ORDER BY, LIMIT HAVING and so on) For NOT EXISTS conversion the subquery should be marked that its left part can't be NULL. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] No coverage for cases where materialization failed to create temptable?
by Sergei Petrunia 06 Dec '11

06 Dec '11

Hi Timour, I was working on BUG#868908, which involves having different kind of handling for cases where Materialization is not applicable because temp table had the wrong properties. So, I've set a goal to catch such cases: === modified file 'sql/item_subselect.cc' --- sql/item_subselect.cc 2011-12-06 21:03:00 +0000 +++ sql/item_subselect.cc 2011-12-06 21:11:16 +0000 @@ -4182,6 +4182,8 @@ bool subselect_hash_sj_engine::init(List */ if (tmp_table->s->keys == 0) { + //fprintf(stderr, "Q: %s\n", current_thd->query()); + DBUG_ASSERT(0); DBUG_ASSERT( tmp_table->s->uniques || tmp_table->key_info->key_length >= tmp_table->file->max_key_length() || Surprisingly, running mysql-test-run t/subselect*.test with this didn't produce any failures. Is this poor test coverage? Or, this branch is now deadcode? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Tools/suggestions for MySQL 5.6 merge
by Kristian Nielsen 06 Dec '11

06 Dec '11

I have been doing a bit of preparation/planning for the upcoming merge of MySQL 5.6. I think the 5.6 merge (and 5.5 merge) is very important for MariaDB. There is much stuff in there that we really need to make available to our users (and probably some better left out). If we fail to keep the merges going, it will leave the community in a very sorry situation; I do not see anyone else stepping up to this task. My idea is that we could merge MySQL 5.6 piece-by-piece. Several other developers mentioned this idea at the Athens meeting: - It makes it much easier to selectively merge or not merge stuff. For example there are probably large chunks of optimiser changes that we do not want to merge (or maybe merge only the testcases for). On the other hand we probably want all InnoDB stuff. - I am hopeful it makes the merge much more managable when done in smaller pieces. Large reorganisations of code (header refactoring, copyright changes) should be easier when not intermixed with other changes. Merges from MySQL 5.5 -> MySQL 5.6 are probably also easier to deal with when done in isolation (I assume we can get conflicts for these, though we already have the equivalent changes in MariaDB 5.5). - Easier to share the task between developers. One developer can do a single piece in a few days, then pass the baton when he needs to switch to other tasks (or just gets tired). Complex merges of large feature pushes can be null-merged to allow main merge to progress, and in parallel another developer can work on reworking the patch into the MariaDB code. For some changes I think we will even be able to do the actual merge in parallel. - Easier to plan and understand how far the merge is progressing. Eg. if we merge M weeks worth of 5.6 pushes every N days, that allows to estimate when we will catch up with Oracle development - Easier debugging of test failures; by keeping the trees green between pieces merged, new test failures will be known to be caused by relatively smaller sets of changes, simplifying debugging. I have done some work to facilitate this kind of piecewise merge. As it turns out, it is not trivial to determine suitable pieces to merge. Oracle developers use no discipline for the direction they do merges in, so the sequence of pushes into lp:mysql-server ("trunk") is not immediately apparent. So I took the time to reconstruct the list of pushes from reading through the history; this was not overly hard to do. I next wrote a script that scans the history based on this list of pushes, and further annotates each push with some useful information: - Size of diff for the patch - Number of changesets merged (if a merge) - Mark if this is a merge from MySQL 5.5 - One-line short comment for the push, either hand-crafted for selected items, or else extracted from the commit message. - Revision ID (including developer info) It should be fairly simple to scan this list from the bottom, collecting chunks of related or manageable pushes and merging them as one piece. Eg. A sequence of small pushes could be merged as one, or a sequence of pushes by one developer, or a single large feature push. Here is an example extract of such an annotated list: 0 2* tor.didriksen(a)oracle.com-20111101065343-ha3d79h1ayk9j7x9 [5.5] Null merge from 5.1/5.5 13 andrei.elkin(a)oracle.com-20111031135232-q13pfsaieo8ujekj Minor test adjustment 791 alexander.nozdrin(a)oracle.com-20111031115220-01la8vj7ssmcm0mc Bug#61392 0 2* tor.didriksen(a)oracle.com-20111031091354-8p6s03s1zxerrp8p [5.5] Null merge Bug#12406055 from 5.1/5.5 5380 15 jorgen.loland(a)oracle.com-20111031081122-dnufl9r4li0i3ni6 [opt] Larger merge from optimiser tree 134 2* andrei.elkin(a)oracle.com-20111028212219-cdcuh37i70k9o4ms [5.5] Merge Bug#56299 (?) from 5.5 451 2 andrei.elkin(a)oracle.com-20111028130851-mz4p2mg28y14wb7k merge from trunk to local tree. 43 sergey.glukhov(a)oracle.com-20111028094528-enre87osw9u4qjy7 [opt] Bug#32254 post-merge fix (optimiser) 48 tor.didriksen(a)oracle.com-20111028092548-a3gjubgmwuhdunfj Bug#11747423 post-merge fix 114 tor.didriksen(a)oracle.com-20111028091835-xqavfrxkc50gbsxq "Default value for sort_buffer_size changed from 2M to 256K" The first column is diff size, the second is number of changesets merged (or empty for non-merge changesets). A "*" marks pushes that are only merges from MySQL 5.5. I pushed the script to lp:mariadb-tools, in /mysql-5.6-merge-stuff/. It also includes the full output in 5.6-annotated.txt (it takes 15-20 minutes for bzr to chew through the history on a fast multi-core machine). I hope this will be useful for the merge. Comments/suggestions/questions very welcome! - Kristian.

1 0

[Maria-developers] MariaDB 5.1.60 and 5.2.10
by Daniel Bartholomew 06 Dec '11

06 Dec '11

All, MariaDB 5.1.60 is nearly ready to release. There are only a couple of mirrors which don't have the files. The changelog and release notes pages are here: * http://kb.askmonty.org/en/mariadb-5160-release-notes * http://kb.askmonty.org/en/mariadb-5160-changelog Unless something comes up, I will probably activate the download page for this release and 5.2.10 in a couple of hours. This will be followed by a combined announce email and so forth. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] MariaDB 5.2.10
by Daniel Bartholomew 05 Dec '11

05 Dec '11

All, The MariaDB 5.2.10 release is just about ready to go. Most of the packages have been mirrored. We're still waiting on Windows packages (we're having some issues with the Windows build server), but they will hopefully be available soon. This brings up the question: Should we delay the release until we have Windows packages or add them after the fact? The Release Notes and Changelog for the release are here: - http://kb.askmonty.org/en/mariadb-5210-release-notes - http://kb.askmonty.org/en/mariadb-5210-changelog Please let me know ASAP if there is anything that should be mentioned in the Release Notes that currently is not (or jump in and add it directly to the page yourself). Serg: The PAM note in the release notes is pretty sparse. Can you add some more to it? Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

Re: [Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 3120: Added suppressions
by Sergei 03 Dec '11

03 Dec '11

Hi, Monty! Can you please explain how it is possible to have "different number rows in the log" ? On Dec 03, noreply(a)launchpad.net wrote: > ------------------------------------------------------------ > revno: 3120 > committer: Michael Widenius <monty(a)askmonty.org> > branch nick: maria-5.1 > timestamp: Sat 2011-12-03 20:29:15 +0200 > message: > Added suppressions > Fixed feedback_plugin_send to not generate a random number of lines. > modified: > mysql-test/t/feedback_plugin_send.test > mysql-test/valgrind.supp > support-files/compiler_warnings.supp > > === modified file 'mysql-test/t/feedback_plugin_send.test' > --- mysql-test/t/feedback_plugin_send.test 2011-11-13 12:28:35 +0000 > +++ mysql-test/t/feedback_plugin_send.test 2011-12-03 18:29:15 +0000 > @@ -17,7 +17,16 @@ > perl; > $log_error= $ENV{'MYSQLTEST_VARDIR'} . '/log/mysqld.1.err'; > open(LOG, '<', $log_error) or die "open(< $log_error): $!"; > - /feedback plugin:.*/ && print "$&\n" while $_=<LOG>; > + > + # Get the first few rows (as there may be different number rows in the log) > + $i= 0; > + while ($_=<LOG>) > + { > + if (/feedback plugin:.*/) > + { > + print "$&\n"; > + break if ($i++ >= 3); > + } > + } > close LOG; > EOF > - > Regards, Sergei

1 0

[Maria-developers] 5.3: optimizer status update and test requests
by Sergei Petrunia 01 Dec '11

01 Dec '11

Hi Elena, A quick update on what has been happening in 5.3 optimizer recently. The text is FYI, requests for QA are marked with 'REQUEST': == Semi-joins: no non-PS crashes, optimizations refactoring == When I was fixing BUG#887468, I have made some refactorings to semi-join optimization code and pushed them into 5.3-main (revno: 3316, revision-id: psergey(a)askmonty.org-20111126082752-u8s9tv928lc67c8o) This change has grown to be more than just refactoring: - EXPLAIN now shows "Start temporary" at different position (documentation pending) - The optimizer may pick certain plans that were not picked before. REQUEST#1: please re-run semi-join optimization tests for the new server. == Discovery of effects of @@optimizer_prune_level == I have (yesterday) found https://bugs.launchpad.net/maria/+bug/898747. In a nutshell, default value of @@optimizer_prune_level=1 causes the optimizer to prune away some semi-join query plans. There can be different views about how serious BUG#898747 is, but its effect is that certain range of query plans were not tested before. REQUEST#2: re-run semi-join optimization tests with @@optimizer_prune_level=0 This can be joined with REQUEST#1 (however, if you find bugs, we're interested to know whether they have been present before the revno:3316 patch). To be continued... BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 2

[Maria-developers] Proposal: change SUBQUERY to MATERIALIZE
by Sergei Petrunia 01 Dec '11

01 Dec '11

2 1

Re: [Maria-developers] Proposal: change SUBQUERY to MATERIALIZE
by Sergei Petrunia 01 Dec '11

01 Dec '11

1 0

Re: [Maria-developers] Proposal: change SUBQUERY to MATERIALIZE
by Sergei Petrunia 01 Dec '11

01 Dec '11

1 0

[Maria-developers] MYSQL_THDVAR and SET GLOBAL
by MARK CALLAGHAN 30 Nov '11

30 Nov '11

Is there an easy way to prevent SET GLOBAL ... from being done for plugin variables declared via MYSQL_THDVAR_...? For the following variable I can do SET GLOBAL innodb_fake_changes=1 and that sets a global variable. static MYSQL_THDVAR_BOOL(fake_changes, PLUGIN_VAR_OPCMDARG, "In the transaction after enabled, UPDATE, INSERT and DELETE only move the cursor to the records " "and do nothing other operations (no changes, no ibuf, no undo, no transaction log) in the transaction. " "This is to cause replication prefetch IO. ATTENTION: the transaction started after enabled is affected.", check_fake_changes, NULL, FALSE); -- Mark Callaghan mdcallag(a)gmail.com

3 2

[Maria-developers] MariaDB 5.5 binary tarball packages and libaio
by Kristian Nielsen 30 Nov '11

30 Nov '11

Hi Wlad, I got some progress with Buildbot and producing binary tarball packages for MariaDB 5.5, using your suggestions. But I encountered a problem. I used -DBUILD_CONFIG=mysql-release and installed libaio-dev. But then the server fails like this: ./bin/mysqld: error while loading shared libraries: libaio.so.1: cannot open shared object file: No such file or directory Of course - as libaio.so must be installed by users. I do not think it is appropriate that users need to install libaio.so to use the binary tarballs (as those are supposed to work anywhere - on the other hand, for .deb for example we _should_ use libaio of course, and dependencies will take care that it is installed). So what to do? For now I've tried to build without libaio for the generic tarballs (-DIGNORE_AIO_CHECK=1). So binaries will work; to get aio, users can build themselves or install real packages. Or do you have another idea? Do you know what MySQL does? One option could be statically linking libaio. Now in general, static linking is a can of worms with many pitfalls, however for just libaio it might work (libaio.so is statically linked on my Debian Wheezy). However, I am not sure if this is safe in general, nor do I know how to make cmake link just libaio statically? Any ideas? - Kristian.

4 4

Re: [Maria-developers] [Commits] Rev 3322: Fixed bug lp:825051 in file:///home/tsk/mprog/src/5.3/
by Oleksandr Byelkin 30 Nov '11

30 Nov '11

29.11.2011 23:06, timour(a)askmonty.org пишет: > At file:///home/tsk/mprog/src/5.3/ > > ------------------------------------------------------------ > revno: 3322 > revision-id: timour(a)askmonty.org-20111129210639-bjcn2pfocub6uwba > parent: holyfoot(a)askmonty.org-20111129112752-6cy8wy7h5q58l6je > fixes bug(s): https://launchpad.net/bugs/825051 > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Tue 2011-11-29 23:06:39 +0200 > message: > Fixed bug lp:825051 > > The cause of the wrong result was that Item_ref_null_helper::get_date() > didn't use a method of the *_result() family, and fetched the data > for the field from the current row instead of result_field. Changed to > use the correct *_result() method, like to all other similar methods > of Item_ref_null_helper. OK to push. Do not forget that we agreed to fix this typo in 5.2 at least.

1 0

[Maria-developers] Alternate fix for BUG#833777 and BUG#894397
by Sergei Petrunia 28 Nov '11

28 Nov '11

Hi Timour, Please find it below. Any objections? === modified file 'sql/sql_select.cc' --- sql/sql_select.cc 2011-11-25 19:54:36 +0000 +++ sql/sql_select.cc 2011-11-28 11:40:42 +0000 @@ -14776,14 +14776,10 @@ do_select(JOIN *join,List<Item> *fields, /* HAVING will be checked after processing aggregate functions, But WHERE should checkd here (we alredy have read tables). - If there is join->exec_const_cond, and all tables are constant, then it - is equivalent to join->conds. exec_const_cond is already checked in the - beginning of JOIN::exec. If it is false, JOIN::exec returns zero - result already there, therefore execution reaches this point only if - exec_const_cond is TRUE. Since it is equvalent to join->conds, then - join->conds is also TRUE. + + (TODO new comment here) */ - if (!join->conds || join->exec_const_cond || join->conds->val_int()) + if (!join->outer_ref_cond || join->outer_ref_cond->val_int()) { error= (*end_select)(join, 0, 0); if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT) BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] [Commits] Rev 3308: Fixed LP BUG#747278 in file:///home/bell/maria/bzr/work-maria-5.3-lpb747278/
by Sergei Petrunia 28 Nov '11

28 Nov '11

Hi Sanja, Ok to push. On Wed, Nov 23, 2011 at 01:46:22AM +0200, sanja(a)askmonty.org wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-lpb747278/ > > ------------------------------------------------------------ > revno: 3308 > revision-id: sanja(a)askmonty.org-20111122234621-b1t47i7xgzsg1hwo > parent: holyfoot(a)askmonty.org-20111122135733-vgsg077x9rbn08r6 > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-lpb747278 > timestamp: Wed 2011-11-23 01:46:21 +0200 > message: > Fixed LP BUG#747278 > > The problem was that when we have single row subquery with no rows > Item_cache(es) which represent result row was not null and being > requested via element_index() returned random value. > > The fix is setting all Item_cache(es) in NULL before executing the > query (reset() method) which guaranty NULL value of whole query > or its elements requested in any way if no rows was found. > > set_null() method was added to Item_cache to guaranty correct NULL > value in case of reseting the cache. > === modified file 'mysql-test/r/subselect.result' > --- a/mysql-test/r/subselect.result 2011-11-22 10:06:46 +0000 > +++ b/mysql-test/r/subselect.result 2011-11-22 23:46:21 +0000 > @@ -5681,4 +5681,85 @@ select a from t1 where a in (select a fr > a > 1 > drop table t1; > +# > +# LP BUG#747278 incorrect values of the NULL (no rows) single > +# row subquery requested via element_index() interface > +# > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +set @@session.optimizer_switch=@old_optimizer_switch; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +select (null, null) = (null, null); > +(null, null) = (null, null) > +NULL > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > +(SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0) > +NULL > +drop tables t1,t2,t3; > +# return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > > === modified file 'mysql-test/r/subselect_no_mat.result' > --- a/mysql-test/r/subselect_no_mat.result 2011-11-22 10:06:46 +0000 > +++ b/mysql-test/r/subselect_no_mat.result 2011-11-22 23:46:21 +0000 > @@ -5680,6 +5680,87 @@ select a from t1 where a in (select a fr > a > 1 > drop table t1; > +# > +# LP BUG#747278 incorrect values of the NULL (no rows) single > +# row subquery requested via element_index() interface > +# > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +set @@session.optimizer_switch=@old_optimizer_switch; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +select (null, null) = (null, null); > +(null, null) = (null, null) > +NULL > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > +(SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0) > +NULL > +drop tables t1,t2,t3; > +# return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > select @@optimizer_switch like '%materialization=on%'; > > === modified file 'mysql-test/r/subselect_no_opts.result' > --- a/mysql-test/r/subselect_no_opts.result 2011-11-21 20:01:47 +0000 > +++ b/mysql-test/r/subselect_no_opts.result 2011-11-22 23:46:21 +0000 > @@ -5676,5 +5676,86 @@ select a from t1 where a in (select a fr > a > 1 > drop table t1; > +# > +# LP BUG#747278 incorrect values of the NULL (no rows) single > +# row subquery requested via element_index() interface > +# > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +set @@session.optimizer_switch=@old_optimizer_switch; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +select (null, null) = (null, null); > +(null, null) = (null, null) > +NULL > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > +(SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0) > +NULL > +drop tables t1,t2,t3; > +# return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/r/subselect_no_scache.result' > --- a/mysql-test/r/subselect_no_scache.result 2011-11-22 10:06:46 +0000 > +++ b/mysql-test/r/subselect_no_scache.result 2011-11-22 23:46:21 +0000 > @@ -5685,6 +5685,87 @@ select a from t1 where a in (select a fr > a > 1 > drop table t1; > +# > +# LP BUG#747278 incorrect values of the NULL (no rows) single > +# row subquery requested via element_index() interface > +# > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +set @@session.optimizer_switch=@old_optimizer_switch; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +select (null, null) = (null, null); > +(null, null) = (null, null) > +NULL > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > +(SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0) > +NULL > +drop tables t1,t2,t3; > +# return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > select @@optimizer_switch like '%subquery_cache=on%'; > > === modified file 'mysql-test/r/subselect_no_semijoin.result' > --- a/mysql-test/r/subselect_no_semijoin.result 2011-11-22 10:06:46 +0000 > +++ b/mysql-test/r/subselect_no_semijoin.result 2011-11-22 23:46:21 +0000 > @@ -5676,5 +5676,86 @@ select a from t1 where a in (select a fr > a > 1 > drop table t1; > +# > +# LP BUG#747278 incorrect values of the NULL (no rows) single > +# row subquery requested via element_index() interface > +# > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +set @@session.optimizer_switch=@old_optimizer_switch; > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) > +NULL > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +(SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +(SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +NULL > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > +(SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) > +NULL > +select (null, null) = (null, null); > +(null, null) = (null, null) > +NULL > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > +(SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0) > +NULL > +drop tables t1,t2,t3; > +# return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/t/subselect.test' > --- a/mysql-test/t/subselect.test 2011-11-21 20:16:01 +0000 > +++ b/mysql-test/t/subselect.test 2011-11-22 23:46:21 +0000 > @@ -4778,4 +4778,47 @@ set @@optimizer_switch='in_to_exists=on, > select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1))))))))))))))))))))))))))))); > drop table t1; > > +--echo # > +--echo # LP BUG#747278 incorrect values of the NULL (no rows) single > +--echo # row subquery requested via element_index() interface > +--echo # > + > +CREATE TABLE t1 (f1a int, f1b int) ; > +INSERT IGNORE INTO t1 VALUES (1,1),(2,2); > +CREATE TABLE t2 ( f2 int); > +INSERT IGNORE INTO t2 VALUES (3),(4); > +CREATE TABLE t3 (f3a int default 1, f3b int default 2); > +INSERT INTO t3 VALUES (1,1),(2,2); > + > +# check different IN with switches where the bug was found > +set @old_optimizer_switch = @@session.optimizer_switch; > +set @@optimizer_switch='materialization=on,partial_match_rowid_merge=on,partial_match_table_scan=off,subquery_cache=off,semijoin=off'; > + > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > + > +set @@session.optimizer_switch=@old_optimizer_switch; > + > +# check different IN with default switches > +SELECT (SELECT f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a FROM t1) FROM t2; > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) NOT IN (SELECT f1a,f1a FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) NOT IN (SELECT f1a, f1b FROM t1); > +SELECT (SELECT f3a FROM t3 where f3a > 3) IN (SELECT f1a FROM t1) FROM t2; > +SELECT (SELECT f3a,f3a FROM t3 where f3a > 3) IN (SELECT f1a,f1a FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1) FROM t2; > +SELECT (SELECT f3a, f3b FROM t3 where f3a > 3) IN (SELECT f1a, f1b FROM t1); > + > +# other row operation with NULL single row subquery also should work > +select (null, null) = (null, null); > +SELECT (SELECT f3a, f3a FROM t3 where f3a > 3) = (0, 0); > + > +drop tables t1,t2,t3; > +--echo # return optimizer switch changed in the beginning of this test > set optimizer_switch=@subselect_tmp; > > === modified file 'sql/item.cc' > --- a/sql/item.cc 2011-11-02 08:05:07 +0000 > +++ b/sql/item.cc 2011-11-22 23:46:21 +0000 > @@ -8201,6 +8201,20 @@ void Item_cache::print(String *str, enum > str->append(')'); > } > > +/** > + Assign to this cache NULL value if it is possible > +*/ > + > +void Item_cache::set_null() > +{ > + if (maybe_null) > + { > + null_value= TRUE; > + value_cached= TRUE; > + } > +} > + > + > bool Item_cache_int::cache_value() > { > if (!example) > @@ -8671,6 +8685,20 @@ void Item_cache_row::bring_value() > } > > > +/** > + Assign to this cache NULL value if it is possible > +*/ > + > +void Item_cache_row::set_null() > +{ > + Item_cache::set_null(); > + if (!values) > + return; > + for (uint i= 0; i < item_count; i++) > + values[i]->set_null(); > +}; > + > + > Item_type_holder::Item_type_holder(THD *thd, Item *item) > :Item(thd, item), enum_set_typelib(0), fld_type(get_real_type(item)) > { > > === modified file 'sql/item.h' > --- a/sql/item.h 2011-11-14 17:24:36 +0000 > +++ b/sql/item.h 2011-11-22 23:46:21 +0000 > @@ -3651,6 +3651,7 @@ public: > return false; > return example->is_expensive_processor(arg); > } > + virtual void set_null(); > }; > > > @@ -3825,6 +3826,7 @@ public: > DBUG_VOID_RETURN; > } > bool cache_value(); > + virtual void set_null(); > }; > > > > === modified file 'sql/item_subselect.cc' > --- a/sql/item_subselect.cc 2011-11-21 14:56:32 +0000 > +++ b/sql/item_subselect.cc 2011-11-22 23:46:21 +0000 > @@ -893,7 +893,10 @@ void Item_singlerow_subselect::reset() > { > Item_subselect::reset(); > if (value) > - value->null_value= TRUE; > + { > + for(uint i= 0; i < engine->cols(); i++) > + row[i]->set_null(); > + } > } > > > @@ -1004,6 +1007,11 @@ void Item_singlerow_subselect::fix_lengt > */ > if (engine->no_tables()) > maybe_null= engine->may_be_null(); > + else > + { > + for (uint i= 0; i < max_columns; i++) > + row[i]->maybe_null= TRUE; > + } > } > > > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] WL#244 New (by Knielsen): Reduced table/row locking for SELECT statement with read-only stored function
by worklog-noreply＠askmonty.org 25 Nov '11

25 Nov '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Reduced table/row locking for SELECT statement with read-only stored function CREATION DATE..: Thu, 24 Nov 2011, 10:55 SUPERVISOR.....: Monty IMPLEMENTOR....: Monty COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 244 (http://askmonty.org/worklog/?tid=244) VERSION........: Server-5.5 STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: When statement (or mixed) binlogging is used, the server currently is overly conservative in its use of table/row locks for SELECT statements that call stored functions. For example: delimiter // CREATE FUNCTION `test_f`(x CHAR(8)) RETURNS INT READS SQL DATA BEGIN DECLARE output INT DEFAULT NULL; SELECT id FROM t1 WHERE a = x INTO output; RETURN output; END // delimiter ; SELECT test_f("foo"); In general, it is possible for a SELECT statement that calls a stored function to modify tables, and thus to need to be binlogged. In statement-based binlogging, this requires taking extra read locks to ensure that replication will apply events from concurrent queries on the master in the correct order, just like normal UPDATE statements. However, most uses of stored functions in SELECT do _not_ modify data, as in the above example. Thus there is no need for extra read locks in statement-based binlog mode, as nothing will be logged to the binlog anyway for the SELECT statement. However, the server currently takes the pessimistic safe route and _always_ takes extra read locks in statement-based binlogging when stored functions are used. There is no analysis to detect that stored functions used are read-only, and hence that no extra locking is needed. This worklog is about improving this so that in common cases where no table modification is done in stored functions, no extra locking is done, while still preserving correct operation for statement-based replication when modification _is_ done. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

2 1

Re: [Maria-developers] Fwd: [Commits] Rev 3296: Fix bug lp:833777 in file:///home/tsk/mprog/src/5.3-lpb833777/
by Sergei Petrunia 21 Nov '11

21 Nov '11

Hi Timour, On Fri, Nov 18, 2011 at 11:16:27PM +0200, Timour Katchaounov wrote: > Sergey, > > Please review the following patch. > Do you have any idea about the change in > func_compress.result ? I've seen that before, > but don't remember what was the issue. I think in this case it is fairly clear - a warning is produced every time a constant expression is evaluated. Your patch makes one less evaluation, so one fewer warning is emitted. The patch is ok to push after the below notes are addressed. > ------------------------------------------------------------ > revno: 3296 > revision-id: timour(a)askmonty.org-20111118201920-fac3c9870u7eh898 > parent: igor(a)askmonty.org-20111118173551-78xd3uuu5h25756u > fixes bug(s): https://launchpad.net/bugs/833777 > committer: timour(a)askmonty.org > branch nick: 5.3-lpb833777 > timestamp: Fri 2011-11-18 22:19:20 +0200 > message: > Fix bug lp:833777 > > Analysis: > The optimizer distinguishes two kinds of 'constant' conditions: > expensive ones, and non-expensive ones. The non-expensive conditions > are evaluated inside make_join_select(), and if false, already the > optimizer detects empty query results. > > In order to avoid arbitrarily expensive optimization, the evaluation of > expensive constant conditions is delayed until execution. These conditions > are attached to JOIN::exec_const_cond and evaluated in the beginning of > JOIN::exec. The relevant execution logic is: > > JOIN::exec() > { > if (! join->exec_const_cond->val_int()) > { > produce an empty result; > stop execution > } > continue execution > execute the original WHERE clause (that contains exec_const_cond) > ... > } > > As a result, when an expensive constant condition is > TRUE, it is evaluated twice - once through > JOIN::exec_const_cond, and once through JOIN::cond. > When the expensive constant condition is a subquery, > predicate, the subquery is evaluated twice. If we have > many levels of subqueries, this logic results in a chain > of recursive subquery executions that walk a perfect > binary tree. The result is that for subquries with depth N, > JOIN::exec is executed O(2^N) times. > > Solution: > Notice that the second execution of the constant conditions > happens inside do_select(), in the branch: > if (join->table_count == join->const_tables) { ... } > In this case exec_const_cond is equivalent to the whole WHERE > clause, therefore the WHERE clause has already been checked in > the beginnig of JOIN::exec, and has been found to be true. > The bug is addressed by not evaluating the WHERE clause if there > was exec_const_conds, and it was TRUE. > === modified file 'mysql-test/r/func_compress.result' > --- a/mysql-test/r/func_compress.result 2011-02-03 15:00:28 +0000 > +++ b/mysql-test/r/func_compress.result 2011-11-18 20:19:20 +0000 > @@ -103,7 +103,6 @@ foo > Warnings: > Error 1259 ZLIB: Input data corrupted > Error 1259 ZLIB: Input data corrupted > -Error 1259 ZLIB: Input data corrupted > explain select *, uncompress(a) from t1; > id select_type table type possible_keys key key_len ref rows Extra > 1 SIMPLE t1 system NULL NULL NULL NULL 1 > > === modified file 'mysql-test/r/subselect.result' > --- a/mysql-test/r/subselect.result 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/r/subselect.result 2011-11-18 20:19:20 +0000 > @@ -5665,4 +5665,14 @@ ERROR 21000: Subquery returns more than > SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > +# > +# LP BUG#833777 Performance regression with deeply nested subqueries > +# > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a > +0 Why use 'benchmark' function? It seems totally redundant. Please change the test to look like: select (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in ... (select a from t1) ))))))))))))))))))))))))))))))))) AS foo; to make it less cluttered. > +drop table t1; > set optimizer_switch=@subselect_tmp; > > === modified file 'mysql-test/r/subselect_no_mat.result' > --- a/mysql-test/r/subselect_no_mat.result 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/r/subselect_no_mat.result 2011-11-18 20:19:20 +0000 > @@ -5670,6 +5670,16 @@ ERROR 21000: Subquery returns more than > SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > +# > +# LP BUG#833777 Performance regression with deeply nested subqueries > +# > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a > +0 > +drop table t1; > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > select @@optimizer_switch like '%materialization=on%'; > > === modified file 'mysql-test/r/subselect_no_opts.result' > --- a/mysql-test/r/subselect_no_opts.result 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/r/subselect_no_opts.result 2011-11-18 20:19:20 +0000 > @@ -5666,5 +5666,15 @@ ERROR 21000: Subquery returns more than > SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > +# > +# LP BUG#833777 Performance regression with deeply nested subqueries > +# > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a > +0 > +drop table t1; > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/r/subselect_no_scache.result' > --- a/mysql-test/r/subselect_no_scache.result 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/r/subselect_no_scache.result 2011-11-18 20:19:20 +0000 > @@ -5669,6 +5669,16 @@ ERROR 21000: Subquery returns more than > SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > +# > +# LP BUG#833777 Performance regression with deeply nested subqueries > +# > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a > +0 > +drop table t1; > set optimizer_switch=@subselect_tmp; > set optimizer_switch=default; > select @@optimizer_switch like '%subquery_cache=on%'; > > === modified file 'mysql-test/r/subselect_no_semijoin.result' > --- a/mysql-test/r/subselect_no_semijoin.result 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/r/subselect_no_semijoin.result 2011-11-18 20:19:20 +0000 > @@ -5666,5 +5666,15 @@ ERROR 21000: Subquery returns more than > SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > +# > +# LP BUG#833777 Performance regression with deeply nested subqueries > +# > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a > +0 > +drop table t1; > set optimizer_switch=@subselect_tmp; > set @optimizer_switch_for_subselect_test=null; > > === modified file 'mysql-test/t/subselect.test' > --- a/mysql-test/t/subselect.test 2011-11-15 21:03:00 +0000 > +++ b/mysql-test/t/subselect.test 2011-11-18 20:19:20 +0000 > @@ -4768,4 +4768,14 @@ SET SESSION sql_mode=@old_sql_mode; > DEALLOCATE PREPARE stmt; > DROP TABLE t1; > > +--echo # > +--echo # LP BUG#833777 Performance regression with deeply nested subqueries > +--echo # > + > +create table t1 (a int not null, b char(10) not null); > +insert into t1 values (1, 'a'); > +set @@optimizer_switch='in_to_exists=on,semijoin=off,materialization=off,subquery_cache=off'; > +select benchmark(1, (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1 where a in (select a from t1)))))))))))))))))))))))))))))))))); > +drop table t1; > + > set optimizer_switch=@subselect_tmp; > > === modified file 'sql/sql_select.cc' > --- a/sql/sql_select.cc 2011-11-15 21:03:00 +0000 > +++ b/sql/sql_select.cc 2011-11-18 20:19:20 +0000 > @@ -14782,9 +14782,15 @@ do_select(JOIN *join,List<Item> *fields, > { > /* > HAVING will be checked after processing aggregate functions, > - But WHERE should checkd here (we alredy have read tables) > + But WHERE should checkd here (we alredy have read tables). > + If there is join->exec_const_cond, and all tables are constant, then it > + is equivalent to join->conds. exec_const_cond is already checked in the > + beginning of JOIN::exec. If it is false, JOIN::exec returns zero > + result already there, therefore execution reaches this point only if > + exec_const_cond is TRUE. Since it is equvalent to join->conds, then > + join->conds is also TRUE. > */ > - if (!join->conds || join->conds->val_int()) > + if (!join->conds || join->exec_const_cond || join->conds->val_int()) > { > error= (*end_select)(join, 0, 0); > if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT) > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] feedback plugin and 5.1 debs
by Kristian Nielsen 16 Nov '11

16 Nov '11

Hi Serg, If you remember, in Athens, we discovered that the feedback plugin is missing from 5.1 .debs. I fixed and pushed this (in the ourdelta scripts). I restarted latest 5.1 buildbot for this, and it seems to work. So just a FYI ... - Kristian.

3 3

Re: [Maria-developers] [Commits] Rev 3276: Fix MySQL BUG#12329653 in file:///home/tsk/mprog/src/5.3/
by Oleksandr Byelkin 12 Nov '11

12 Nov '11

Hi! 12 нояб. 2011, в 10:24, <timour(a)askmonty.org> написал(а): The patch is OK to push after one small change: > At file:///home/tsk/mprog/src/5.3/ > > ------------------------------------------------------------ > revno: 3276 > revision-id: timour(a)askmonty.org-20111112082415-7t6jjzdfg35la7aq > parent: igor(a)askmonty.org-20111111225326-k11e0durn6kvivly > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Sat 2011-11-12 10:24:15 +0200 > message: > Fix MySQL BUG#12329653 > > In MariaDB, when running in ONLY_FULL_GROUP_BY mode, > the server produced in incorrect error message that there > is an aggregate function without GROUP BY, for artificially > created MIN/MAX functions during subquery MIN/MAX optimization. > > The fix introduces a way to distinguish between artifially > created MIN/MAX functions as a result of a rewrite, and normal > ones present in the query. The test for ONLY_FULL_GROUP_BY violation > now tests in addition if a MIN/MAX function was part of a MIN/MAX > subquery rewrite. > > In order to be able to distinguish these MIN/MAX functions, the > patch introduces an additional flag in Item_in_subselect::in_strategy - > SUBS_STRATEGY_CHOSEN. This flag is set when the optimizer makes its > final choice of a subuqery strategy. In order to make the choice > consistent, access to Item_in_subselect::in_strategy is provided > via new class methods. > ****** > Fix MySQL BUG#12329653 > > In MariaDB, when running in ONLY_FULL_GROUP_BY mode, > the server produced in incorrect error message that there > is an aggregate function without GROUP BY, for artificially > created MIN/MAX functions during subquery MIN/MAX optimization. > > The fix introduces a way to distinguish between artifially > created MIN/MAX functions as a result of a rewrite, and normal > ones present in the query. The test for ONLY_FULL_GROUP_BY violation > now tests in addition if a MIN/MAX function was part of a MIN/MAX > subquery rewrite. > > In order to be able to distinguish these MIN/MAX functions, the > patch introduces an additional flag in Item_in_subselect::in_strategy - > SUBS_STRATEGY_CHOSEN. This flag is set when the optimizer makes its > final choice of a subuqery strategy. In order to make the choice > consistent, access to Item_in_subselect::in_strategy is provided > via new class methods. > [skip] > @@ -2606,9 +2606,8 @@ bool > Item_allany_subselect::select_transformer(JOIN *join) > { > DBUG_ENTER("Item_allany_subselect::select_transformer"); > - DBUG_ASSERT((in_strategy & ~(SUBS_MAXMIN_INJECTED | SUBS_MAXMIN_ENGINE | > - SUBS_IN_TO_EXISTS)) == 0); > - in_strategy|= SUBS_IN_TO_EXISTS; > +// DBUG_ASSERT((in_strategy & ~(SUBS_MAXMIN_INJECTED | SUBS_MAXMIN_ENGINE | > +// SUBS_IN_TO_EXISTS)) == 0); > if (upper_item) > upper_item->show= 1; > DBUG_RETURN(select_in_like_transformer(join)); > @@ -2617,7 +2616,7 @@ Item_allany_subselect::select_transforme Remove the comment, but better change it to: DBUG_ASSERT((in_strategy & ~(SUBS_MAXMIN_INJECTED | SUBS_MAXMIN_ENGINE | SUBS_IN_TO_EXISTS | SUBS_STRATEGY_CHOSEN)) == 0); [skip]

1 0

[Maria-developers] Shared plugin library build question
by Steve Ellcey 12 Nov '11

12 Nov '11

I am looking at a difference in the HP-UX vs. Linux mariadb build and was wondering if someone could help me understand why something is set up the way it is. The problem I see is that on HP-UX, when I do a mariadb build I do not get shared plugin libraries like ha_federated. Looking into why this was happening I found that when the plugin libraries like ha_federated are built they have a dependency on libsqlservices and libsqlservices is built only as an archive library. HP-UX doesn't support building shared libaries that depend on archive libraries and so the build of the shared plugin libraries fails when no shared version of libsqlservices is found. So my main question is: why is libsqlservices built only as an archive library? The other question is: if libsqlservices has to be an archive only library, is there is another way to link it in to executables, such as linking it in explicitly when building an executable instead of counting on the shared plugin libraries to bring it in indirectly by making it a dependent library? Steve Ellcey sje(a)cup.hp.com

3 29

Re: [Maria-developers] Shared plugin library build question
by Sergei Golubchik 09 Nov '11

09 Nov '11

Hi, Michael! On Nov 09, Michael Widenius wrote: > > Hi! > > >>>>> "Vladislav" == Vladislav Vaintroub <wlad(a)montyprogram.com> writes: > > <cut> > > > I think the best option for MySQL, and for MariaDB is to rename own base64.h and function prototypes in a way that it does not conflict with system headers on any system it is meant to be run on. Relying on the include order is fragile, I also do not see how it would not solve the problem with same function name different prototypes - how can we always reliably force use our base64_encode rather than system one ? > > Yes, we should rename it to my_base64.h in MySQL 5.5 > > Serg, can you do that for your next push to 5.5? Yes, but this is just one of the problems that was mentioned in this thread. I'll wait till the list is complete and 5.5 compiles. Regards, Sergei

1 0

[Maria-developers] FYI: @@optimizer_switch default changed to have semijoin switched ON.
by Sergei Petrunia 08 Nov '11

08 Nov '11

Hi! If you haven't noticed: last week I've pushed a change that enabled semi-join optimization flags by default, i.e. now the default @@optimizer_swich value has: semijoin=on firstmatch=on loosescan=on Philip: if you have any testing planned for "after semi-join optimizations are enabled by default", now it's time to do them. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 2

[Maria-developers] Bug in ENUM options handling?
by Steve Ellcey 04 Nov '11

04 Nov '11

While working on MariaDB on HP-UX we noticed an inconsistency involving the type of enum arguments. In init_variables and init_one_value (mysys/my_getopt.c), ENUM options are treated as unsigned longs but the enum arguments are actually declared as uint instead of ulong. While this doesn't matter in 32 bit mode when int's and longs's are the same size, it can cause problems in 64 bit mode when long's are 64 bits and int's 32 bits. We found 4 variables that we think should be ulong instead of uint: plugin_maturity plugin_maturity_map thread_handling delay_key_write_options We also changed the value field in the sys_var_enum class (sql/set_var.h) from a uint pointer to a ulong pointer and changed the sys_var_enum and sys_var_enum_const constructors to use a ulong pointer argument for value_arg to make everything consistent. I suppose init_variables and init_one_value could be changed to treat ENUM's as uint instead of ulong but the use of ulong seemed to be intentional so we didn't try making that change as an alternative fix. Is this a change that should be made in the official MariaDB sources? Steve Ellcey sje(a)cup.hp.com

5 8

[Maria-developers] review: [Commits] Rev 3045: Fix gcc 4.6 warning after merge with 5.1 in file:///home/bell/maria/bzr/work-maria-5.2-merge/
by Michael Widenius 04 Nov '11

04 Nov '11

Hi! Review follows: > Fix gcc 4.6 warning after merge with 5.1 > === modified file 'sql/table.cc' > --- a/sql/table.cc 2011-09-01 18:18:29 +0000 > +++ b/sql/table.cc 2011-10-27 16:18:25 +0000 > @@ -5484,7 +5484,7 @@ int update_virtual_fields(THD *thd, TABL > { > DBUG_ENTER("update_virtual_fields"); > Field **vfield_ptr, *vfield; > - int error= 0; > + int error __attribute__ ((unused))= 0; > if (!table || !table->vfield) > DBUG_RETURN(0); The above is wrong. The bug is that we ignore the value of error later down: error= vfield->vcol_info->expr_item->save_in_field(vfield, 0); We should change the above code to be: if (!ignore_errors && error < 0) { my_printf_error(ER_UNKNOWN_ERROR, "Got error when computing value for virtual column %s", vfield->field_name, MYF(0)); DBUG_RETURN(1); } We also need to add 'ignore_errors' as a parameter and add the new parameter to the calls. This can for now be '0' for all cases except for the cases where we check the value for the function, like in fill_record where we already handle the ignore_errors variable. Regards, Monty

1 0

[Maria-developers] Ubuntu 11.10 "Oneiric" packages
by Kristian Nielsen 02 Nov '11

02 Nov '11

Hi Daniel, I believe I've fixed the issues for our .debs on Ubuntu 11.10. I made buildbot create packages for MariaDB 5.2.9. They pass the tests. Buildnumber: 1325 Location in archive: /archive/pack/5.2/build-1325/kvm-deb-oneiric-* Maybe you can make them available alongside the existing 5.2.9 packages? It is the exact code version as the other platforms, but the packaging scripts are modified of course. There is no apparmor profile by default (this kept causing new problems, and future packages on Ubuntu will have it disabled by default). Maybe you can help test them as an extra check on top of the automatic ones in buildbot? I also tried getting 5.3 packages built, but Buildbot kept building the latest revision rather than the 5.3.2 one. I can probably solve that somehow, but unless it is urgent I would like to just wait for the next 5.3 release, which will get Oneiric packages automatically. Note that for 5.1, we currently have a problem, as Oneiric has MySQL 5.1.58 while the MariaDB version is 5.1.55. But for the next 5.1 release we will presumably merge MySQL 5.1.58 anyway, so this will get solved and most people will want to use 5.2 anyway I think. I think that's it, let me know if you have questions or other suggestions. - Kristian.

2 4

Re: [Maria-developers] How you build the MariaDB packages for Ubuntu
by Kristian Nielsen 02 Nov '11

02 Nov '11

Marian Marinov <mm(a)yuhu.biz> writes: > I'm trying to build MariaDB packages for CentOS. > But the problem I have is that the Policy of the distro does not allow > packages that are drop-in replacements of core packages. > Meaning that I can not simply build MariaDB which will provide libmysqlclient > and mysql binaries. > > Can you share with me what is the situation over in the Debian/Ubuntu camp ? In Debian/Ubuntu, there are no "Official" MariaDB packages yet. The ones we provide do replace the standard mysql packages, which is possible since there are no policies enforced for 3rd-party repositories. It will need to be fixed eventually, of course. The normal way I think in Debian is to have MariaDB and MySQL as alternatives, just like Some versions of Ubuntu/Debian have mysql-5.0 and mysql-5.1 as alternatives (can install one or the other, but not both). It is not 100% clear to me what your situation is (I'm not much familiar with CentOS or RPM). Are you saying that the MariaDB packages you create *must* be possible to install alongside the Official CentOS packages? In that case I suppose you have little option but to run mariadb on a different port, different data directory, different socket, different binary names. It seems to be sub-optimal for users, as they would need to reconfigure anything they want to use with MariaDB away from the standard port/names in the MySQL world. Still, this is perfectly possible to do. Configure a non-standard port in your my.cnf, build and install mariadb with a different --prefix, /opt/mariadb or whatever. - Kristian.

3 2

Re: [Maria-developers] [Commits] Rev 3262: Fix bug lp:833702 in file:///home/tsk/mprog/src/5.3/
by Oleksandr Byelkin 01 Nov '11

01 Nov '11

Hi! 01.11.2011 18:19, timour(a)askmonty.org пишет: > At file:///home/tsk/mprog/src/5.3/ > > ------------------------------------------------------------ > revno: 3262 > revision-id: timour(a)askmonty.org-20111101161919-hukh3tipjms3lfzf > parent: sanja(a)askmonty.org-20111101112209-n4ghsy9hpliiassm > fixes bug(s): https://launchpad.net/bugs/833702 > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Tue 2011-11-01 18:19:19 +0200 > message: > Fix bug lp:833702 > > Analysis: > Equality propagation propagated the constant '7' into > args[0] of the Item_in_optimizer that stands for the > "< ANY" predicate. At the same the min/max subquery > rewrite swapped the order of the left and right operands > of the "<" predicate, but used Item_in_subselect::left_expr. > > As a result, when the<ANY predicate is executed early in the > execution phase as a contant condition, instead of a constant > right (swapped) argument of the< predicate, there was a field > (t3.a). This field had no data, since the whole predicate is > considered constant, and it is evaluated before any tables are > read. Having junk in the field row buffer produced wrong result > > Solution: > Fix create_swap to pick the correct Item_in_optimizer left > argument. OK to push.

1 0

[Maria-developers] MariaDB test question (main.cast)
by sje＠cup.hp.com 28 Oct '11

28 Oct '11

I have downloaded, built and tested MariaDB 5.3.2 Beta on HP-UX 11.31 and I get two test failures, I have a question about one of tests that I was hoping someone could help me with. The main.cast test fails and the problem is with this part of the test: select cast(cast(20010203101112.1 as double) as datetime(1)); It is converting the string "20010203101112.1" to a double value and then converting the double value to a date. The test expects "2001-02-03 10:11:12.1" to be output but I am getting "2001-02-03 10:11:12.0". I think the problem is with the conversion into floating point. When I use gdb to break sql at double_to_datetime, on HP-UX the value I have is 20010203101112.098, on Linux I see 20010203101112.102. Neither value is completely correct because 20010203101112.1 cannot be represented exactly as an IEEE floating point value. So I have two questions. Where did the string get converted into a floating point value? I couldn't find where this is happening, I assume it is using strtod or something but breaking on that function didn't do anything. Secondly, given that 20010203101112.1 cannot be represented exactly as a double precision floating point value, is this a valid test? FYI: The other failure I get is main.cast, this test is trying to check for a stack overflow before it happens but IA64 HP-UX has two stacks, a register stack and a user data stack. In this test case the recursion of p_ere and p_ere_exp wind up using only the register stack because all the local variables and arguments are stored in registers. The stack check in check_stack_overrun is checking the user stack which doesn't overflow (or even change) and so we eventually die with a register stack overflow. There is a way to check the register stack on IA64 HP-UX, but it would require using IA64 assembly language so it may not be worth doing. Steve Ellcey sje(a)cup.hp.com

3 4

Re: [Maria-developers] [Commits] Rev 3100: Fix gcc 4.6 warnings about assigned but not used variables. in file:///home/bell/maria/bzr/work-maria-5.1-applebuild/
by Michael Widenius 27 Oct '11

27 Oct '11

Hi! >>>>> "sanja" == sanja <sanja(a)askmonty.org> writes: sanja> At file:///home/bell/maria/bzr/work-maria-5.1-applebuild/ sanja> ------------------------------------------------------------ sanja> revno: 3100 sanja> revision-id: sanja(a)askmonty.org-20111025142424-dntpnipgi5qxg2io sanja> parent: wlad(a)montyprogram.com-20111019185101-fw3oxkpr2o060qk4 sanja> committer: sanja(a)askmonty.org sanja> branch nick: work-maria-5.1-applebuild sanja> timestamp: Tue 2011-10-25 17:24:24 +0300 sanja> message: sanja> Fix gcc 4.6 warnings about assigned but not used variables. sanja> Fixed my_gethwaddr.c to allow compilation on Mac OS X. <cut> === modified file 'sql/sql_show.cc' --- a/sql/sql_show.cc 2011-05-12 11:56:08 +0000 +++ b/sql/sql_show.cc 2011-10-25 14:24:24 +0000 @@ -1215,7 +1215,7 @@ int store_create_info(THD *thd, TABLE_LI handler *file= table->file; TABLE_SHARE *share= table->s; HA_CREATE_INFO create_info; - bool show_table_options= FALSE; + bool show_table_options __attribute__ ((unused))= FALSE; bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | MODE_ORACLE | MODE_MSSQL | Add instead: #ifdef WITH_PARTITION_STORAGE_ENGINE around the this the definition of the variable. @@ -1432,7 +1432,9 @@ int store_create_info(THD *thd, TABLE_LI packet->append(STRING_WITH_LEN("\n)")); if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode) { +#ifdef WITH_PARTITION_STORAGE_ENGINE show_table_options= TRUE; +#endif The above is correct; Better to do it this way. === modified file 'storage/maria/ma_blockrec.c' --- a/storage/maria/ma_blockrec.c 2011-07-24 08:25:28 +0000 +++ b/storage/maria/ma_blockrec.c 2011-10-25 14:24:24 +0000 @@ -4997,7 +4997,7 @@ static my_bool read_row_extent_info(MARI MARIA_EXTENT_CURSOR extent; MARIA_RECORD_POS *tail_pos; uchar *data, *end_of_data; - uint flag, row_extents, row_extents_size, field_lengths; + uint flag, row_extents, row_extents_size; uchar *extents, *end; DBUG_ENTER("read_row_extent_info"); @@ -5032,9 +5032,6 @@ static my_bool read_row_extent_info(MARI } info->cur_row.extents_count= row_extents; - if (share->base.max_field_lengths) - get_key_length(field_lengths, data); - The above is wrong. get_key_length will increment data, which is required as data it's used later. Better to leave field_lengths there for the future. (Please fix this in 5.3 too !) You can avoid the warning by doing: get_key_length= get_key_length; === modified file 'storage/maria/ma_dynrec.c' --- a/storage/maria/ma_dynrec.c 2011-02-25 12:55:40 +0000 +++ b/storage/maria/ma_dynrec.c 2011-10-25 14:24:24 +0000 @@ -1741,7 +1741,8 @@ int _ma_read_rnd_dynamic_record(MARIA_HA MARIA_RECORD_POS filepos, my_bool skip_deleted_blocks) { - int block_of_record, info_read; + int block_of_record; + int info_read; Why the above? === modified file 'storage/maria/ma_ft_update.c' --- a/storage/maria/ma_ft_update.c 2009-01-30 21:55:42 +0000 +++ b/storage/maria/ma_ft_update.c 2011-10-25 14:24:24 +0000 @@ -319,7 +319,6 @@ my_bool _ma_ft_convert_to_ft2(MARIA_HA * uchar *key_ptr= (uchar*) dynamic_array_ptr(da, 0), *end; uint length, key_length; MARIA_PINNED_PAGE tmp_page_link, *page_link= &tmp_page_link; - MARIA_KEY tmp_key; MARIA_PAGE page; DBUG_ENTER("_ma_ft_convert_to_ft2"); @@ -357,13 +356,8 @@ my_bool _ma_ft_convert_to_ft2(MARIA_HA * /* inserting the rest of key values */ end= (uchar*) dynamic_array_ptr(da, da->elements); - tmp_key.keyinfo= keyinfo; - tmp_key.data_length= keyinfo->keylength; - tmp_key.ref_length= 0; - tmp_key.flag= 0; for (key_ptr+=length; key_ptr < end; key_ptr+=keyinfo->keylength) { - tmp_key.data= key_ptr; if (_ma_ck_real_write_btree(info, key, &root, SEARCH_SAME)) DBUG_RETURN(1); } Wrong. The correct fix is: if (_ma_ck_real_write_btree(info, key, &root, SEARCH_SAME)) DBUG_RETURN(1); -> if (_ma_ck_real_write_btree(info, &tmp_key, &root, SEARCH_SAME)) DBUG_RETURN(1); Apparently free textsearch with Aria is not tested properly :( <cut> === modified file 'storage/maria/ma_open.c' --- a/storage/maria/ma_open.c 2011-07-24 08:25:28 +0000 +++ b/storage/maria/ma_open.c 2011-10-25 14:24:24 +0000 @@ -1802,7 +1802,6 @@ void _ma_set_index_pagecache_callbacks(P int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, File file_to_dup __attribute__((unused))) { - char *data_name= share->data_file_name.str; char real_data_name[FN_REFLEN]; if (org_name) @@ -1816,7 +1815,6 @@ int _ma_open_datafile(MARIA_HA *info, MA my_errno= HA_WRONG_CREATE_OPTION; return 1; } - data_name= real_data_name; } } Wrong: The correct fix is: info->dfile.file= share->bitmap.file.file= my_open(share->data_file_name.str, share->mode | O_SHARE, MYF(MY_WME)); -> info->dfile.file= share->bitmap.file.file= my_open(data_name, share->mode | O_SHARE, MYF(MY_WME)); The above means that symlinking didn't work on windows with Aria files. === modified file 'storage/maria/ma_rt_split.c' --- a/storage/maria/ma_rt_split.c 2010-09-05 23:25:44 +0000 +++ b/storage/maria/ma_rt_split.c 2011-10-25 14:24:24 +0000 @@ -380,7 +380,6 @@ int maria_rtree_split_page(const MARIA_K SplitStruct *stop; double *coord_buf; double *next_coord; - double *old_coord; int n_dim; uchar *source_cur, *cur1, *cur2; uchar *new_page_buff, *log_internal_copy, *log_internal_copy_ptr, @@ -426,7 +425,6 @@ int maria_rtree_split_page(const MARIA_K maria_rtree_d_mbr(keyinfo->seg, key->data, key_data_length, cur->coords); cur->key= key->data; - old_coord= next_coord; myisam/rt_split.c has the exact same code. You should do the same change there. === modified file 'storage/myisam/mi_check.c' --- a/storage/myisam/mi_check.c 2011-05-02 17:58:45 +0000 +++ b/storage/myisam/mi_check.c 2011-10-25 14:24:24 +0000 @@ -946,7 +946,6 @@ int chk_data_link(HA_CHECK *param, MI_IN char llbuff[22],llbuff2[22],llbuff3[22]; ha_checksum intern_record_checksum; ha_checksum key_checksum[HA_MAX_POSSIBLE_KEY]; - my_bool static_row_size; MI_KEYDEF *keyinfo; MI_BLOCK_INFO block_info; DBUG_ENTER("chk_data_link"); @@ -971,7 +970,6 @@ int chk_data_link(HA_CHECK *param, MI_IN empty=info->s->pack.header_length; /* Check how to calculate checksum of rows */ - static_row_size=1; if (info->s->data_file_type == COMPRESSED_RECORD) { for (field=0 ; field < info->s->base.fields ; field++) @@ -979,7 +977,6 @@ int chk_data_link(HA_CHECK *param, MI_IN if (info->s->rec[field].base_type == FIELD_BLOB || info->s->rec[field].base_type == FIELD_VARCHAR) { - static_row_size=0; break; } } Please remove also the if and the loop around the above code. === modified file 'storage/pbxt/src/ha_pbxt.cc' --- a/storage/pbxt/src/ha_pbxt.cc 2010-11-26 22:37:34 +0000 +++ b/storage/pbxt/src/ha_pbxt.cc 2011-10-25 14:24:24 +0000 @@ -1559,7 +1559,7 @@ static int pbxt_rollback(handlerton *hto if (!all) self->st_stat_trans = FALSE; } - return 0; + return err; } #ifdef DRIZZLED @@ -2863,7 +2863,7 @@ int ha_pbxt::update_row(const byte * old * insert into t1 (val) values (1); */ if (table->found_next_number_field && new_data == table->record[0]) { - MX_LONGLONG_T nr; + MX_LONGLONG_T nr __attribute__ ((unused)); my_bitmap_map *old_map; old_map = mx_tmp_use_all_columns(table, table->read_set); Better to remove the nr value totally (and the call that sets it). This is safe as in the code: nr = table->found_next_number_field->val_int(); ha_set_auto_increment(pb_open_tab, table->found_next_number_field); The first thing ha_set_auto_increment() is doing is calling val_int() on the second argument. <cut> === modified file 'storage/pbxt/src/thread_xt.cc' --- a/storage/pbxt/src/thread_xt.cc 2010-09-28 13:05:45 +0000 +++ b/storage/pbxt/src/thread_xt.cc 2011-10-25 14:24:24 +0000 @@ -485,7 +485,8 @@ static void thr_free_resources(XTThreadP xtPublic void xt_bug(XTThreadPtr XT_UNUSED(self)) { - static int *bug_ptr = NULL; + static int *bug_ptr __attribute__ ((unused)); + bug_ptr= NULL; bug_ptr = NULL; } No reason to set this to null twice. Better to remove the variable altogether. === modified file 'storage/pbxt/src/xactlog_xt.cc' --- a/storage/pbxt/src/xactlog_xt.cc 2010-05-05 10:59:57 +0000 +++ b/storage/pbxt/src/xactlog_xt.cc 2011-10-25 14:24:24 +0000 @@ -2117,7 +2117,7 @@ xtBool XTDatabaseLog::xlog_seq_next(XTXa size_t rec_offset; size_t max_rec_len; size_t size; - u_int check_size = 1; + u_int check_size __attribute__ ((unused))= 1; Don't understand the above change. We both set check_size and test it in the above function. Are you sure that you get a warning about the above? /* Go to the next record (xseq_record_len must be initialized * to 0 for this to work. @@ -2629,7 +2629,7 @@ static void *xlog_wr_run_thread(XTThread { XTDatabaseHPtr db = (XTDatabaseHPtr) self->t_data; int count; - void *mysql_thread; + void *mysql_thread __attribute__ ((unused)); mysql_thread = myxt_create_thread(); === modified file 'storage/xtradb/btr/btr0cur.c' --- a/storage/xtradb/btr/btr0cur.c 2011-04-29 14:16:42 +0000 +++ b/storage/xtradb/btr/btr0cur.c 2011-10-25 14:24:24 +0000 @@ -3301,7 +3301,7 @@ static void btr_record_not_null_field_in_rec( /*=============================*/ - rec_t* rec, /*!< in: physical record */ + rec_t* rec __attribute__ ((unused)),/*!< in: physical record */ ulint n_unique, /*!< in: dict_index_get_n_unique(index), number of columns uniquely determine an index entry */ @@ -3321,9 +3321,8 @@ btr_record_not_null_field_in_rec( for (i = 0; i < n_unique; i++) { ulint rec_len; - byte* field; - field = rec_get_nth_field(rec, offsets, i, &rec_len); + rec_get_nth_field_offs(offsets, i, &rec_len); if (rec_len != UNIV_SQL_NULL) { n_not_null[i]++; === modified file 'storage/xtradb/buf/buf0buf.c' --- a/storage/xtradb/buf/buf0buf.c 2011-04-29 14:16:42 +0000 +++ b/storage/xtradb/buf/buf0buf.c 2011-10-25 14:24:24 +0000 @@ -3895,7 +3895,7 @@ buf_page_io_complete( enum buf_io_fix io_type; const ibool uncompressed = (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE); - enum buf_flush flush_type; + //enum buf_flush flush_type; mutex_t* block_mutex; ut_a(buf_page_in_file(bpage)); @@ -4051,7 +4051,7 @@ corrupt: //buf_pool_mutex_enter(); if (io_type == BUF_IO_WRITE) { - flush_type = buf_page_get_flush_type(bpage); + //flush_type = buf_page_get_flush_type(bpage); /* to keep consistency at buf_LRU_insert_zip_clean() */ //if (flush_type == BUF_FLUSH_LRU) { /* optimistic! */ mutex_enter(&LRU_list_mutex); Remove the variable from the start of the function and enum buf_flush flush_type; to the if. That way, all the comments are in one place. Ok to push after the above changes. Regards, Monty

3 5

Re: [Maria-developers] FYI optimizer problems fixed in maria-5.5
by Sergei Petrunia 27 Oct '11

27 Oct '11

Hello! JFYI I've just pushed the fix for table_elim.test into 5.5-main. With this, I consider my involvement with 5.5 merge to be done, i.e. I don't have anything on my todo that's related to 5.5. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] [Commits] Rev 3249: Fix of LP BUG#872775. in file:///home/bell/maria/bzr/work-maria-5.3-lpb872775/
by Sergei Petrunia 26 Oct '11

26 Oct '11

Hi Sanja, Please add a comment around the defitions of nest_level / nest_level_base that nest_levels are local to the query or VIEW, and that view merge procedure does not re-calculate them. Ok to push after the above is addressed. On Tue, Oct 25, 2011 at 11:59:37AM +0300, sanja(a)askmonty.org wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-lpb872775/ > > ------------------------------------------------------------ > revno: 3249 > revision-id: sanja(a)askmonty.org-20111025085936-h0jyyxtbv3qhp4f4 > parent: igor(a)askmonty.org-20111023124603-sjv665ajk25b4dgi > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-lpb872775 > timestamp: Tue 2011-10-25 11:59:36 +0300 > message: > Fix of LP BUG#872775. > > The problem was that merged views has its own nest_level numbering => > when we compare nest levels we should take into considiration basis (i.e. 0 level), > if it is different then nest levels are not comparable. > === modified file 'mysql-test/r/subselect_cache.result' > --- a/mysql-test/r/subselect_cache.result 2011-07-19 20:19:10 +0000 > +++ b/mysql-test/r/subselect_cache.result 2011-10-25 08:59:36 +0000 > @@ -1,3 +1,5 @@ > +drop table if exists t1,t2,t3,t4,t5; > +drop view if exists v1; > set optimizer_switch='subquery_cache=on'; > create table t1 (a int, b int); > insert into t1 values (1,2),(3,4),(1,2),(3,4),(3,4),(4,5),(4,5),(5,6),(5,6),(4,5); > @@ -3354,5 +3356,31 @@ f1 f2 f3 f3 > 7 0 0 0 > 7 0 0 0 > drop tables t1, t2, t3; > +# > +# Test of LP BUG#872775 view with "outer references" bug > +# > +set @@optimizer_switch= default; > +set optimizer_switch='subquery_cache=on'; > +CREATE TABLE t1 (a int) ; > +CREATE TABLE t2 (b int, c varchar(1) NOT NULL ) ; > +INSERT INTO t2 VALUES (1,'x'),(2,'y'); > +CREATE TABLE t3 (a int) ; > +CREATE TABLE t4 ( pk int(11) NOT NULL , b int(11) NOT NULL ) ; > +INSERT INTO t4 VALUES (26,9),(27,5),(28,0),(29,3); > +CREATE OR REPLACE VIEW v1 AS > +SELECT t2.b > +FROM t1 > +JOIN t2 > +WHERE t2 .c > ( > +SELECT t2.c FROM t3 > +); > +SELECT * FROM t4 WHERE b NOT IN ( SELECT * FROM v1 ); > +pk b > +26 9 > +27 5 > +28 0 > +29 3 > +drop view v1; > +drop table t1,t2,t3,t4; > # restore default > set @@optimizer_switch= default; > > === modified file 'mysql-test/t/subselect_cache.test' > --- a/mysql-test/t/subselect_cache.test 2011-07-19 20:19:10 +0000 > +++ b/mysql-test/t/subselect_cache.test 2011-10-25 08:59:36 +0000 > @@ -1,4 +1,10 @@ > > +--disable_warnings > +drop table if exists t1,t2,t3,t4,t5; > +drop view if exists v1; > +--enable_warnings > + > + > set optimizer_switch='subquery_cache=on'; > > create table t1 (a int, b int); > @@ -1664,5 +1670,33 @@ FROM t1 > WHERE t2.f1 OR t2.f3 ); > drop tables t1, t2, t3; > > +--echo # > +--echo # Test of LP BUG#872775 view with "outer references" bug > +--echo # > +set @@optimizer_switch= default; > +set optimizer_switch='subquery_cache=on'; > +CREATE TABLE t1 (a int) ; > + > +CREATE TABLE t2 (b int, c varchar(1) NOT NULL ) ; > +INSERT INTO t2 VALUES (1,'x'),(2,'y'); > + > +CREATE TABLE t3 (a int) ; > + > +CREATE TABLE t4 ( pk int(11) NOT NULL , b int(11) NOT NULL ) ; > +INSERT INTO t4 VALUES (26,9),(27,5),(28,0),(29,3); > + > +CREATE OR REPLACE VIEW v1 AS > +SELECT t2.b > +FROM t1 > +JOIN t2 > +WHERE t2 .c > ( > + SELECT t2.c FROM t3 > + ); > + > +SELECT * FROM t4 WHERE b NOT IN ( SELECT * FROM v1 ); > + > +drop view v1; > +drop table t1,t2,t3,t4; > + > --echo # restore default > set @@optimizer_switch= default; > > === modified file 'sql/item.cc' > --- a/sql/item.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/item.cc 2011-10-25 08:59:36 +0000 > @@ -755,7 +755,9 @@ bool Item_ident::remove_dependence_proce > bool Item_ident::collect_outer_ref_processor(uchar *param) > { > Collect_deps_prm *prm= (Collect_deps_prm *)param; > - if (depended_from && depended_from->nest_level < prm->nest_level) > + if (depended_from && > + depended_from->nest_level_base == prm->nest_level_base && > + depended_from->nest_level < prm->nest_level) > prm->parameters->add_unique(this, &cmp_items); > return FALSE; > } > > === modified file 'sql/item.h' > --- a/sql/item.h 2011-10-22 07:14:27 +0000 > +++ b/sql/item.h 2011-10-25 08:59:36 +0000 > @@ -505,6 +505,7 @@ typedef void (*Cond_traverser) (const It > class Item_equal; > class COND_EQUAL; > > +class st_select_lex_unit; > > class Item { > Item(const Item &); /* Prevent use of these */ > @@ -1159,8 +1160,10 @@ public: > } > struct Collect_deps_prm > { > - int nest_level; > List<Item> *parameters; > + /* unit from which we count nest_level */ > + st_select_lex_unit *nest_level_base; > + int nest_level; > }; > /** > Collect outer references > > === modified file 'sql/item_subselect.cc' > --- a/sql/item_subselect.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/item_subselect.cc 2011-10-25 08:59:36 +0000 > @@ -599,7 +599,9 @@ bool Item_subselect::exec() > > void Item_subselect::get_cache_parameters(List<Item> &parameters) > { > - Collect_deps_prm prm= { unit->first_select()->nest_level, &parameters }; > + Collect_deps_prm prm= {&parameters, > + unit->first_select()->nest_level_base, > + unit->first_select()->nest_level}; > walk(&Item::collect_outer_ref_processor, TRUE, (uchar*)&prm); > } > > > === modified file 'sql/item_sum.cc' > --- a/sql/item_sum.cc 2011-07-19 20:19:10 +0000 > +++ b/sql/item_sum.cc 2011-10-25 08:59:36 +0000 > @@ -359,7 +359,9 @@ bool Item_sum::collect_outer_ref_process > { > Collect_deps_prm *prm= (Collect_deps_prm *)param; > SELECT_LEX *ds; > - if ((ds= depended_from()) && ds->nest_level < prm->nest_level) > + if ((ds= depended_from()) && > + ds->nest_level_base == prm->nest_level_base && > + ds->nest_level < prm->nest_level) > prm->parameters->add_unique(this, &cmp_items); > return FALSE; > } > > === modified file 'sql/sql_lex.cc' > --- a/sql/sql_lex.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/sql_lex.cc 2011-10-25 08:59:36 +0000 > @@ -339,6 +339,7 @@ void lex_start(THD *thd) > lex->event_parse_data= NULL; > lex->profile_options= PROFILE_NONE; > lex->nest_level=0 ; > + lex->select_lex.nest_level_base= &lex->unit; > lex->allow_sum_func= 0; > lex->in_sum_func= NULL; > lex->protect_against_global_read_lock= FALSE; > > === modified file 'sql/sql_lex.h' > --- a/sql/sql_lex.h 2011-09-22 22:13:38 +0000 > +++ b/sql/sql_lex.h 2011-10-25 08:59:36 +0000 > @@ -684,6 +684,7 @@ public: > ulong table_join_options; > uint in_sum_expr; > uint select_number; /* number of select (used for EXPLAIN) */ > + SELECT_LEX_UNIT *nest_level_base; /* unit from which we count nest_level */ > int nest_level; /* nesting level of select */ > Item_sum *inner_sum_func_list; /* list of sum func in nested selects */ > uint with_wild; /* item list contain '*' */ > > === modified file 'sql/sql_parse.cc' > --- a/sql/sql_parse.cc 2011-10-11 10:55:42 +0000 > +++ b/sql/sql_parse.cc 2011-10-25 08:59:36 +0000 > @@ -5917,6 +5917,7 @@ mysql_new_select(LEX *lex, bool move_dow > DBUG_RETURN(1); > } > select_lex->nest_level= lex->nest_level; > + select_lex->nest_level_base= &thd->lex->unit; > if (move_down) > { > SELECT_LEX_UNIT *unit; > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] [Commits] Rev 3249: Fix of LP BUG#872775. in file:///home/bell/maria/bzr/work-maria-5.3-lpb872775/
by Sergei Petrunia 25 Oct '11

25 Oct '11

On Tue, Oct 25, 2011 at 11:59:37AM +0300, sanja(a)askmonty.org wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-lpb872775/ > > ------------------------------------------------------------ > revno: 3249 > revision-id: sanja(a)askmonty.org-20111025085936-h0jyyxtbv3qhp4f4 > parent: igor(a)askmonty.org-20111023124603-sjv665ajk25b4dgi > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-lpb872775 > timestamp: Tue 2011-10-25 11:59:36 +0300 > message: > Fix of LP BUG#872775. > > The problem was that merged views has its own nest_level numbering => > when we compare nest levels we should take into considiration basis (i.e. 0 level), > if it is different then nest levels are not comparable. :grep nest_level_base *.h *.c* item.h|1165| st_select_lex_unit *nest_level_base; sql_lex.h|687| SELECT_LEX_UNIT *nest_level_base; /* unit from which we count nest_level */ item.cc|759| depended_from->nest_level_base == prm->nest_level_base && item_subselect.cc|603| unit->first_select()->nest_level_base, item_sum.cc|363| ds->nest_level_base == prm->nest_level_base && sql_lex.cc|342| lex->select_lex.nest_level_base= &lex->unit; sql_parse.cc|5920| select_lex->nest_level_base= &thd->lex->unit; The only places where nest_level_base is assigned are: sql_lex.cc|342| lex->select_lex.nest_level_base= &lex->unit; sql_parse.cc|5920| select_lex->nest_level_base= &thd->lex->unit; both of these initialize it to the top-level unit. So what is the point of having nest_level_base in this case? Please clarify :) > === modified file 'mysql-test/r/subselect_cache.result' > --- a/mysql-test/r/subselect_cache.result 2011-07-19 20:19:10 +0000 > +++ b/mysql-test/r/subselect_cache.result 2011-10-25 08:59:36 +0000 > @@ -1,3 +1,5 @@ > +drop table if exists t1,t2,t3,t4,t5; > +drop view if exists v1; > set optimizer_switch='subquery_cache=on'; > create table t1 (a int, b int); > insert into t1 values (1,2),(3,4),(1,2),(3,4),(3,4),(4,5),(4,5),(5,6),(5,6),(4,5); > @@ -3354,5 +3356,31 @@ f1 f2 f3 f3 > 7 0 0 0 > 7 0 0 0 > drop tables t1, t2, t3; > +# > +# Test of LP BUG#872775 view with "outer references" bug > +# > +set @@optimizer_switch= default; > +set optimizer_switch='subquery_cache=on'; > +CREATE TABLE t1 (a int) ; > +CREATE TABLE t2 (b int, c varchar(1) NOT NULL ) ; > +INSERT INTO t2 VALUES (1,'x'),(2,'y'); > +CREATE TABLE t3 (a int) ; > +CREATE TABLE t4 ( pk int(11) NOT NULL , b int(11) NOT NULL ) ; > +INSERT INTO t4 VALUES (26,9),(27,5),(28,0),(29,3); > +CREATE OR REPLACE VIEW v1 AS > +SELECT t2.b > +FROM t1 > +JOIN t2 > +WHERE t2 .c > ( > +SELECT t2.c FROM t3 > +); > +SELECT * FROM t4 WHERE b NOT IN ( SELECT * FROM v1 ); > +pk b > +26 9 > +27 5 > +28 0 > +29 3 > +drop view v1; > +drop table t1,t2,t3,t4; > # restore default > set @@optimizer_switch= default; > > === modified file 'mysql-test/t/subselect_cache.test' > --- a/mysql-test/t/subselect_cache.test 2011-07-19 20:19:10 +0000 > +++ b/mysql-test/t/subselect_cache.test 2011-10-25 08:59:36 +0000 > @@ -1,4 +1,10 @@ > > +--disable_warnings > +drop table if exists t1,t2,t3,t4,t5; > +drop view if exists v1; > +--enable_warnings > + > + > set optimizer_switch='subquery_cache=on'; > > create table t1 (a int, b int); > @@ -1664,5 +1670,33 @@ FROM t1 > WHERE t2.f1 OR t2.f3 ); > drop tables t1, t2, t3; > > +--echo # > +--echo # Test of LP BUG#872775 view with "outer references" bug > +--echo # > +set @@optimizer_switch= default; > +set optimizer_switch='subquery_cache=on'; > +CREATE TABLE t1 (a int) ; > + > +CREATE TABLE t2 (b int, c varchar(1) NOT NULL ) ; > +INSERT INTO t2 VALUES (1,'x'),(2,'y'); > + > +CREATE TABLE t3 (a int) ; > + > +CREATE TABLE t4 ( pk int(11) NOT NULL , b int(11) NOT NULL ) ; > +INSERT INTO t4 VALUES (26,9),(27,5),(28,0),(29,3); > + > +CREATE OR REPLACE VIEW v1 AS > +SELECT t2.b > +FROM t1 > +JOIN t2 > +WHERE t2 .c > ( > + SELECT t2.c FROM t3 > + ); > + > +SELECT * FROM t4 WHERE b NOT IN ( SELECT * FROM v1 ); > + > +drop view v1; > +drop table t1,t2,t3,t4; > + > --echo # restore default > set @@optimizer_switch= default; > > === modified file 'sql/item.cc' > --- a/sql/item.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/item.cc 2011-10-25 08:59:36 +0000 > @@ -755,7 +755,9 @@ bool Item_ident::remove_dependence_proce > bool Item_ident::collect_outer_ref_processor(uchar *param) > { > Collect_deps_prm *prm= (Collect_deps_prm *)param; > - if (depended_from && depended_from->nest_level < prm->nest_level) > + if (depended_from && > + depended_from->nest_level_base == prm->nest_level_base && > + depended_from->nest_level < prm->nest_level) > prm->parameters->add_unique(this, &cmp_items); > return FALSE; > } > > === modified file 'sql/item.h' > --- a/sql/item.h 2011-10-22 07:14:27 +0000 > +++ b/sql/item.h 2011-10-25 08:59:36 +0000 > @@ -505,6 +505,7 @@ typedef void (*Cond_traverser) (const It > class Item_equal; > class COND_EQUAL; > > +class st_select_lex_unit; > > class Item { > Item(const Item &); /* Prevent use of these */ > @@ -1159,8 +1160,10 @@ public: > } > struct Collect_deps_prm > { > - int nest_level; > List<Item> *parameters; > + /* unit from which we count nest_level */ > + st_select_lex_unit *nest_level_base; > + int nest_level; > }; > /** > Collect outer references > > === modified file 'sql/item_subselect.cc' > --- a/sql/item_subselect.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/item_subselect.cc 2011-10-25 08:59:36 +0000 > @@ -599,7 +599,9 @@ bool Item_subselect::exec() > > void Item_subselect::get_cache_parameters(List<Item> &parameters) > { > - Collect_deps_prm prm= { unit->first_select()->nest_level, &parameters }; > + Collect_deps_prm prm= {&parameters, > + unit->first_select()->nest_level_base, > + unit->first_select()->nest_level}; > walk(&Item::collect_outer_ref_processor, TRUE, (uchar*)&prm); > } > > > === modified file 'sql/item_sum.cc' > --- a/sql/item_sum.cc 2011-07-19 20:19:10 +0000 > +++ b/sql/item_sum.cc 2011-10-25 08:59:36 +0000 > @@ -359,7 +359,9 @@ bool Item_sum::collect_outer_ref_process > { > Collect_deps_prm *prm= (Collect_deps_prm *)param; > SELECT_LEX *ds; > - if ((ds= depended_from()) && ds->nest_level < prm->nest_level) > + if ((ds= depended_from()) && > + ds->nest_level_base == prm->nest_level_base && > + ds->nest_level < prm->nest_level) > prm->parameters->add_unique(this, &cmp_items); > return FALSE; > } > > === modified file 'sql/sql_lex.cc' > --- a/sql/sql_lex.cc 2011-10-22 07:14:27 +0000 > +++ b/sql/sql_lex.cc 2011-10-25 08:59:36 +0000 > @@ -339,6 +339,7 @@ void lex_start(THD *thd) > lex->event_parse_data= NULL; > lex->profile_options= PROFILE_NONE; > lex->nest_level=0 ; > + lex->select_lex.nest_level_base= &lex->unit; > lex->allow_sum_func= 0; > lex->in_sum_func= NULL; > lex->protect_against_global_read_lock= FALSE; > > === modified file 'sql/sql_lex.h' > --- a/sql/sql_lex.h 2011-09-22 22:13:38 +0000 > +++ b/sql/sql_lex.h 2011-10-25 08:59:36 +0000 > @@ -684,6 +684,7 @@ public: > ulong table_join_options; > uint in_sum_expr; > uint select_number; /* number of select (used for EXPLAIN) */ > + SELECT_LEX_UNIT *nest_level_base; /* unit from which we count nest_level */ > int nest_level; /* nesting level of select */ > Item_sum *inner_sum_func_list; /* list of sum func in nested selects */ > uint with_wild; /* item list contain '*' */ > > === modified file 'sql/sql_parse.cc' > --- a/sql/sql_parse.cc 2011-10-11 10:55:42 +0000 > +++ b/sql/sql_parse.cc 2011-10-25 08:59:36 +0000 > @@ -5917,6 +5917,7 @@ mysql_new_select(LEX *lex, bool move_dow > DBUG_RETURN(1); > } > select_lex->nest_level= lex->nest_level; > + select_lex->nest_level_base= &thd->lex->unit; > if (move_down) > { > SELECT_LEX_UNIT *unit; > BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

[Maria-developers] WL#243 New (by Psergey): Support >63 tables in a select
by worklog-noreply＠askmonty.org 24 Oct '11

24 Oct '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Support >63 tables in a select CREATION DATE..: Mon, 24 Oct 2011, 18:38 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 243 (http://askmonty.org/worklog/?tid=243) VERSION........: WorkLog-4.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Quote: > Number of joins in a view >63 > MariaDB has a limit of 63 tables joined in a select statement. This > needs to be extended in order to handle the many number of attributes > that may be connected to an anchor. Preferably a much larger number than > 63 in order to be 'future proof'. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] WL#242 New (by Psergey): Parameterized VIEWs
by worklog-noreply＠askmonty.org 24 Oct '11

24 Oct '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Parameterized VIEWs CREATION DATE..: Mon, 24 Oct 2011, 16:57 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 242 (http://askmonty.org/worklog/?tid=242) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Quote: > We need views which can take a specified number of parameters of a > specified type. For example, the syntax could be something like: > > CREATE VIEW exampleView (@timepoint DATE) AS > SELECT FROM WHERE colDate <= @timepoint; > > Implementation could be done as simple as doing a search and replace > with the variable and the parameter given when the view is used, such > as: > > SELECT * FROM exampleView('2001-01-01'); ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] [Commits] Rev 3246: Fix bug lp:869036
by Sergei Golubchik 21 Oct '11

21 Oct '11

Hi, Timour! On Oct 21, timour(a)askmonty.org wrote: I don't understand, why do you need map_ptr_array (working memory provided by the caller). Looks like unnecessary complication to me. I'd do something like for (j= 0; j < bitmap_count; j++) DBUG_ASSERT(end_bit < bitmap_array[j]->n_bits); start_idx= start_bit/8/sizeof(my_bitmap_map); end_idx= end_bit/8/sizeof(my_bitmap_map); for (i= start_idx; i < end_idx; i++) { cur_res= ~0; for (j= 0; cur_res && j < bitmap_count; j++) cur_res &= bitmap_array[j]->bitmap[i]; if (cur_res) return TRUE; } cur_res= last_word_mask(end_bit); for (j= 0; cur_res && j < bitmap_count; j++) cur_res &= bitmap_array[j]->bitmap[end_idx+1]; return cur_res != 0; } and created last_word_mask() function by extracting the relevant part of create_last_word_mask() to a separate inline function. Besides, it may be that your implementation has a bug - you use a last word mask from the shortest bitmap, while you should've built it from end_bit. Now you risk taking more bits into account that end_bit dictates. > === modified file 'mysys/my_bitmap.c' > --- a/mysys/my_bitmap.c 2011-05-02 17:58:45 +0000 > +++ b/mysys/my_bitmap.c 2011-10-21 09:44:36 +0000 > @@ -410,6 +410,88 @@ void bitmap_intersect(MY_BITMAP *map, co > } > } > > + > +/* > + Check if there is some bit index between start_bit and end_bit, such that > + this is bit is set for all bitmaps in bitmap_list. > + > + SYNOPSIS > + bitmap_exists_intersection() > + bitmpap_array [in] a set of MY_BITMAPs > + map_ptr_array [in] wokring memory provided by the caller, same size as > + bitmpap_array > + bitmap_count [in] number of elements in bitmpap_array > + start_bit [in] beginning (inclusive) of the range of bits to search > + end_bit [in] end (inclusive) of the range of bits to search, must be > + no bigger than the bits of the shortest bitmap. > + > + NOTES > + This function assumes that for at least one of the bitmaps in bitmap_array all > + bits outside the range [start_bit, end_bit] are 0. As a result is not > + necessary to take care of the bits outside the range [start_bit, end_bit]. > + > + RETURN > + TRUE if an intersecion exists > + FALSE no intersection > +*/ > + > +my_bool bitmap_exists_intersection(const MY_BITMAP **bitmap_array, > + const my_bitmap_map **map_ptr_array, > + uint bitmap_count, > + uint start_bit, uint end_bit) > +{ > + const MY_BITMAP *cur_bitmap; > + my_bitmap_map cur_res, last_word_mask_inverted= 0; > + uint i, j, min_n_bits= UINT_MAX; > + uint end_word_idx= end_bit / 32; > + > + DBUG_ASSERT(bitmap_count && end_bit >= start_bit); > + for (j= 0; j < bitmap_count; j++) > + { > + cur_bitmap= bitmap_array[j]; > + DBUG_ASSERT(end_bit <= cur_bitmap->n_bits); > + /* > + Get the word that contains 'start_bit' so that intersection begins > + from that word instead of the first word of the bitmap. > + */ > + map_ptr_array[j]= cur_bitmap->bitmap + start_bit / 32; > + /* > + Find and save the last_word_mask of the shortest bitmap that > + contains end_bit in its last word. > + */ > + if (no_words_in_map(bitmap_array[j]) - 1 == end_word_idx && > + bitmap_array[j]->n_bits < min_n_bits) > + { > + min_n_bits= bitmap_array[j]->n_bits; > + last_word_mask_inverted= ~bitmap_array[j]->last_word_mask; > + } > + } > + > + /* Find the first word where the intersection of all bits is non-empty. */ > + for (i= 0; i <= end_word_idx; i++) > + { > + cur_res= 0xFFFFFFFF; > + for (j= 0; j < bitmap_count; j++) > + { > + cur_res &= *(map_ptr_array[j]); > + ++map_ptr_array[j]; > + } > + /* Clear not relevant bits using the longest last_word_mask. */ > + if (last_word_mask_inverted && i == end_word_idx) > + cur_res&= last_word_mask_inverted; > + /* > + If there is at least one non-zero bit, there was at least one sub-row > + with all bits set, that is one NULL-subrow. > + */ > + if (cur_res) > + return TRUE; > + } > + > + /* No intersection was found. */ > + return FALSE; > +} Regards, Sergei

1 0

[Maria-developers] optimizer_switch flags for next 5.3 release
by Sergei Petrunia 19 Oct '11

19 Oct '11

Hi, Written down notes from discussion about which flags should be enabled by default in the next 5.3 release: - Derived tables and keys in them should be enabled - BKA should not be enabled (doesn't make sense for 'default' query loads) - semi-joins should be enabled - Materialization (base) should be enabled - extra strategies for NULL-aware materialization - ??? - ICP should be enabled - Hash join could be enabled but in the next minor release. - Cost-based MRR should not be enabled as cost model is not tuned. when some feature is considered stable enough, its owner should apply for testing with {$current_optimizer_switch_default+new_feature}, and once that is passed, change the default in the main branch. BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] Compiler warning about assigned but not used variables fixed
by Sergei Golubchik 18 Oct '11

18 Oct '11

Hi, Sanja! On Oct 17, sanja(a)askmonty.org wrote: > message: > Compiler warning about assigned but not used variables fixed. Pretty much ok. But please change ifdef's to __attribute__((unused)), as discussed. And see below about the commented out code, looks like you forgot to fix or uncomment it. > === modified file 'client/mysqltest.cc' > --- a/client/mysqltest.cc 2011-05-28 02:11:32 +0000 > +++ b/client/mysqltest.cc 2011-10-17 19:38:32 +0000 > @@ -5238,7 +5238,10 @@ void do_connect(struct st_command *comma > int con_port= opt_port; > char *con_options; > my_bool con_ssl= 0, con_compress= 0; > - my_bool con_pipe= 0, con_shm= 0; > + my_bool con_pipe= 0; > +#ifdef HAVE_SMEM > + my_bool con_shm= 0; > +#endif try not to overuse #ifdef's, (*) prefer __attribute__((unused)) instead. it is less error-prone and results in a more maintainable and readable code. > struct st_connection* con_slot; > > static DYNAMIC_STRING ds_connection_name; > === modified file 'mysys/ma_dyncol.c' > --- a/mysys/ma_dyncol.c 2011-09-22 09:04:00 +0000 > +++ b/mysys/ma_dyncol.c 2011-10-17 19:38:32 +0000 > @@ -1916,16 +1915,18 @@ dynamic_column_update_many(DYNAMIC_COLUM > } > > /* if (new_offset_size != offset_size) then we have to rewrite header */ > + /* > + Now we only copy. TODO: fix > + > header_delta_sign= new_offset_size - offset_size; > data_delta_sign= 0; > - copy= FALSE; > for (i= 0; i < add_column_count; i++) > { > - /* This is the check for increasing/decreasing */ > + // This is the check for increasing/decreasing > DELTA_CHECK(header_delta_sign, plan[i].hdelta, copy); > DELTA_CHECK(data_delta_sign, plan[i].ddelta, copy); > } > - > + */ why did you comment this out? > calc_param(&new_entry_size, &new_header_size, > new_offset_size, new_column_count); > > === modified file 'sql/sql_show.cc' > --- a/sql/sql_show.cc 2011-10-11 10:55:42 +0000 > +++ b/sql/sql_show.cc 2011-10-17 19:38:32 +0000 > @@ -1274,7 +1274,9 @@ int store_create_info(THD *thd, TABLE_LI > handler *file= table->file; > TABLE_SHARE *share= table->s; > HA_CREATE_INFO create_info; > +#ifdef WITH_PARTITION_STORAGE_ENGINE > bool show_table_options= FALSE; > +#endif same here, and below. > bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | > MODE_ORACLE | > MODE_MSSQL | > @@ -1507,7 +1509,9 @@ int store_create_info(THD *thd, TABLE_LI > packet->append(STRING_WITH_LEN("\n)")); > if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode) > { > +#ifdef WITH_PARTITION_STORAGE_ENGINE > show_table_options= TRUE; > +#endif > /* > Get possible table space definitions and append them > to the CREATE TABLE statement > > === modified file 'sql/table.cc' > --- a/sql/table.cc 2011-09-02 12:10:10 +0000 > +++ b/sql/table.cc 2011-10-17 19:38:32 +0000 > @@ -5689,7 +5689,8 @@ int update_virtual_fields(THD *thd, TABL > { > DBUG_ENTER("update_virtual_fields"); > Field **vfield_ptr, *vfield; > - int error= 0; > + int error __attribute__ ((unused)); > + error= 0; FYI, you can still use initializer and __attribute__ together: int error __attribute__ ((unused)) = 0; there is no need to change the above, either way is ok. > if (!table || !table->vfield) > DBUG_RETURN(0); > > === modified file 'storage/xtradb/buf/buf0buf.c' > --- a/storage/xtradb/buf/buf0buf.c 2011-05-10 15:17:43 +0000 > +++ b/storage/xtradb/buf/buf0buf.c 2011-10-17 19:38:32 +0000 > @@ -3895,7 +3895,7 @@ buf_page_io_complete( > enum buf_io_fix io_type; > const ibool uncompressed = (buf_page_get_state(bpage) > == BUF_BLOCK_FILE_PAGE); > - enum buf_flush flush_type; > + //enum buf_flush flush_type; please send all your XtraDB changes to Percona > mutex_t* block_mutex; > Regards, Sergei (*) see for example http://www.google.com/search?q=ifdef+considered+harmful

2 2

Re: [Maria-developers] MariaDB 5.3.2 beta is being released
by Daniel Bartholomew 14 Oct '11

14 Oct '11

On Thu, 13 Oct 2011 11:13:07 -0400 Daniel Bartholomew <dbart(a)montyprogram.com> wrote: Daniel> I'm uploading the release to the primary mirror now. Is there Daniel> anything in particular we should be sure to put into the Daniel> Release Notes? The MariaDB 5.3.2 files have been mirrored to all but one of the mirrors, so I've activated the download, release notes, and changelog pages. http://kb.askmonty.org/en/mariadb-532-release-notes http://kb.askmonty.org/en/mariadb-532-changelog http://downloads.askmonty.org/mariadb/5.3.2 On the release notes page, I mentioned the Feedback plugin. Is there anything else that should be mentioned? Please let me know ASAP, as I will be sending out the announce email shortly. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

1 0

[Maria-developers] Feature request: Add support for a syntax check for SQL scripts
by Raphael Vullriede 14 Oct '11

14 Oct '11

Hi, we have a lot of developers writing a lot of SQL scripts against a lot of different databases. These scripts usually consists of mixed DDL (e.g. change a column definition) and DML (e.g. adding new master data). Since our applications are constantly under development we'd like to add these scripts to our continuous integration environment. For that it would be great to have a feature that checks the script against a given database without actually executing it. It should not only check the SQL syntax but also if all mentioned tables, columns etc. exists in the given database. It is not possible to use transactions for that since DDL is (currently) not transactional. I'm thinking of something like this: SET DISABLE_EXECUTION="TRUE"; -- here come the sql statements SET DISABLE_EXECUTION="FALSE"; I've tried to write such a check with an external tool but as it turned out this is virtually impossible and has a lot of loopholes. Do you think it would be possible to implement something like this in the server? Thanks, Raphael

5 7

[Maria-developers] FW:MariaDB 5.3.2 beta is being released
by Sergei Petrunia 13 Oct '11

13 Oct '11

----- Forwarded message from Sergei Petrunia <psergey(a)askmonty.org> ----- Date: Thu, 13 Oct 2011 12:55:36 +0400 From: Sergei Petrunia <psergey(a)askmonty.org> To: maria-docs(a)lists.launchpad.net, maria-dev(a)lists.launchpad.net, community(a)askmonty.org Subject: MariaDB 5.3.2 beta is being released Hello, MariaDB 5.3.2 beta is being built. The tip changeset is: revno: 3231 tags: mariadb-5.3.2-beta revision-id: psergey(a)askmonty.org-20111012201551-t0nswetvvpp2a4sm parent: psergey(a)askmonty.org-20111012174056-ov0wq91z6z4zrajd committer: Sergey Petrunya <psergey(a)askmonty.org> branch nick: 5.3-push19 timestamp: Thu 2011-10-13 00:15:51 +0400 message: Remove garbage comment The buildnumber is 255, tarbuildnum=1289. BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog ----- End forwarded message ----- -- BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

[Maria-developers] FW: [pstoev@askmonty.org: Re: MariaDB 5.3.2 beta is being released
by Sergei Petrunia 13 Oct '11

13 Oct '11

(Forwarding as this was sent to wrong 'maria-dev' address): ----- Forwarded message from Philip Stoev <pstoev(a)askmonty.org> ----- From: Philip Stoev <pstoev(a)askmonty.org> To: Sergei Petrunia <psergey(a)askmonty.org> Cc: maria-docs(a)lists.launchpad.net, maria-dev(a)lists.launchpad.net, community(a)askmonty.org Subject: Re: MariaDB 5.3.2 beta is being released Date: Thu, 13 Oct 2011 12:01:32 +0300 Organization: Monty Program AB X-Mailer: Microsoft Outlook Express 6.00.2900.5931 Windows packages have been built and are available at a new location: http://i7.askmonty.org/packages/ Philip Stoev ----- Original Message ----- From: "Sergei Petrunia" <psergey(a)askmonty.org> To: <maria-docs(a)lists.launchpad.net>; <maria-dev(a)lists.launchpad.net>; <community(a)askmonty.org> Sent: Thursday, October 13, 2011 11:55 AM Subject: MariaDB 5.3.2 beta is being released > Hello, > > MariaDB 5.3.2 beta is being built. The tip changeset is: > > revno: 3231 > tags: mariadb-5.3.2-beta > revision-id: psergey(a)askmonty.org-20111012201551-t0nswetvvpp2a4sm > parent: psergey(a)askmonty.org-20111012174056-ov0wq91z6z4zrajd > committer: Sergey Petrunya <psergey(a)askmonty.org> > branch nick: 5.3-push19 > timestamp: Thu 2011-10-13 00:15:51 +0400 > message: > Remove garbage comment > > > The buildnumber is 255, tarbuildnum=1289. > > BR > Sergey > -- > Sergei Petrunia, Software Developer > Monty Program AB, http://askmonty.org > Blog: http://s.petrunia.net/blog > ----- End forwarded message ----- -- BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] rqg-perpush-replication fails
by Sergei Petrunia 13 Oct '11

13 Oct '11

Hi Kristian, I've got RQG replication tests fail as follows for 5.3: http://buildbot.askmonty.org/buildbot/builders/rqg-perpush-replication/buil… http://buildbot.askmonty.org/buildbot/builders/rqg-perpush-replication-chec… 111013 2:36:57 [ERROR] /home/buildbot/buildbot_basedir/rqg-perpush-replication-checksum/build/sql/mysqld: unknown option '--binlog-annotate-rows-events' 111013 3:30:24 [ERROR] /home/buildbot/buildbot_basedir/rqg-perpush-replication/build/sql/mysqld: unknown variable 'binlog_annotate_rows_events=1' This seems like a trivial failure that was overlooked? BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] open_binary_frm() decomposed an methods of TABLE_SHARE
by Sergei Golubchik 12 Oct '11

12 Oct '11

Hi, Sanja! On Oct 04, sanja(a)askmonty.org wrote: > ------------------------------------------------------------ > revno: 3202 > revision-id: sanja(a)askmonty.org-20111004111459-1i44vpkdm1j3lisl > parent: psergey(a)askmonty.org-20110929130743-yj0zl4hdvoydnmda > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-frm2 > timestamp: Tue 2011-10-04 14:14:59 +0300 > message: > open_binary_frm() decomposed an methods of TABLE_SHARE to allow > engine to create TABLE_SHARE. > > utype and geometry_type moved out of Field. Thanks! Here're my thoughts. The summary is: 1. I'd like to have it simpler. It's going to be an external API for engines to use, after all. 2. Don't try to support all optimizations that open_binary_frm() uses, and old frm formats - keep that out of the API, open_binary_frm() can modify TABLE_SHARE directly to achieve the necessary effect. 3. Try to create a usage example - it will show the unnecessary complexity See all the comments below: > === modified file 'sql/handler.h' > --- a/sql/handler.h 2011-07-14 13:44:37 +0000 > +++ b/sql/handler.h 2011-10-04 11:14:59 +0000 > @@ -298,6 +298,31 @@ enum legacy_db_type > DB_TYPE_FIRST_DYNAMIC=42, > DB_TYPE_DEFAULT=127 // Must be last > }; > + > +/* > + We use three additional unireg types for TIMESTAMP to overcome limitation > + of current binary format of .frm file. We'd like to be able to support > + NOW() as default and on update value for such fields but unable to hold > + this info anywhere except unireg_check field. This issue will be resolved > + in more clean way with transition to new text based .frm format. > + See also comment for Field_timestamp::Field_timestamp(). > +*/ > +enum utype > +{ > + UT_NONE, UT_DATE, UT_SHIELD, UT_NOEMPTY, UT_CASEUP, UT_PNR, > + UT_BGNR, UT_PGNR, UT_YES, UT_NO, UT_REL, > + UT_CHECK, UT_EMPTY, UT_UNKNOWN_FIELD, UT_CASEDN, > + UT_NEXT_NUMBER, UT_INTERVAL_FIELD, > + UT_BIT_FIELD, UT_TIMESTAMP_OLD_FIELD, UT_CAPITALIZE, > + UT_BLOB_FIELD, UT_TIMESTAMP_DN_FIELD, UT_TIMESTAMP_UN_FIELD, > + UT_TIMESTAMP_DNUN_FIELD > +}; Why wouldn't you remove all unused values from utype enum? > +enum geometry_type > +{ > + GEOM_GEOMETRY = 0, GEOM_POINT = 1, GEOM_LINESTRING = 2, GEOM_POLYGON = 3, > + GEOM_MULTIPOINT = 4, GEOM_MULTILINESTRING = 5, GEOM_MULTIPOLYGON = 6, > + GEOM_GEOMETRYCOLLECTION = 7 > +}; > /* > Better name for DB_TYPE_UNKNOWN. Should be used for engines that do not have > a hard-coded type value here. > === modified file 'sql/table.cc' > --- a/sql/table.cc 2011-09-02 12:10:10 +0000 > +++ b/sql/table.cc 2011-10-04 11:14:59 +0000 > @@ -675,6 +684,797 @@ err_not_open: > } > > > +/** > + Set some general table parameters (should be called first after the > + TABLE SHARE initialization) > + > + @param frm_ver Version of the frm (FRM_VER_TRUE_VARCHAR) no need to pass it as a parameter, set frm version always to the latest one. if needed - overwrite it later from open_binary_frm(). don't add support for historical features into the API. > + @param db_create_opt Flags of CREATE options > + @param avg_row_len Average row length > + @param transact CREATE option TRANSACTION > + @param page_chcksum CREATE option PAGE_CHECK_SUM > + @param rtype CREATE option ROW_TYPE (used by aria only) > + @param charset default charset for the table. > + @param null_fld_first Should be TRUE for modern frm same as frm_version > + @param mi_rows CREATE option MIN_ROWS > + @param ma_rows CREATE option MAX_ROWS > + @param reclen Record buffer length > + @param extra_rec_buf_len Extra record buffer length (???) > + @param key_blck_size CREATE option KEY_BLOCK_SIZE > + @param new_fld_pck_flg Should be 2 for modern frm same as frm_version > + @param error Error code assigned here in case of error > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +bool TABLE_SHARE::set_init_parameters(uchar frm_ver, ulong mysql_ver, > + uint db_create_opt, > + ulong avg_row_len, > + enum ha_choice transact, > + enum ha_choice page_chcksum, > + enum row_type rtype, > + CHARSET_INFO *charset, > + bool null_fld_first, > + ha_rows mi_rows, > + ha_rows ma_rows, > + ulong reclen, > + uint extra_rec_buf_len, > + uint key_blck_size, > + uint new_fld_pck_flg, > + int &error) use a pointer, not a reference. Or, better, just return the error code > +{ > + frm_version= frm_ver; > + mysql_version= mysql_ver; > + db_options_in_use= db_create_options= db_create_opt; > + if (db_create_options & HA_OPTION_LONG_BLOB_PTR) > + blob_ptr_size= portable_sizeof_char_ptr; > + avg_row_length= avg_row_len; > + transactional= transact; > + page_checksum= page_chcksum; > + row_type= rtype; > + table_charset= charset; > + null_field_first= null_fld_first; > + db_record_offset= 1; > + min_rows= mi_rows; > + max_rows= ma_rows; > + stored_rec_length= reclength= reclen; > + key_block_size= key_blck_size; > + new_field_pack_flag= new_fld_pck_flg; > + rec_buff_length= ALIGN_SIZE(reclength + 1 + extra_rec_buf_len); > + if (!(default_values= (uchar *) alloc_root(&mem_root, > + rec_buff_length))) > + { > + error= 4; > + return TRUE; > + } > + /* Default values */ > + system= 0; > + crypted= 0; > + > + return FALSE; > +} > + > + > +/** > + Allocate space for indices and its parts > + > + @param nkeys Number of keys > + @param nkey_parts Number of key parts of all keys > + @param names_len Sum of lengths of all indices names (string ends > + are not counted) > + @param error Error code assigned here in case of error\ return the error code instead > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +bool TABLE_SHARE::allocate_indices_space(uint nkeys, uint nkey_parts, > + uint names_len, int &error) > +{ > + uint n_length= (nkeys * sizeof(KEY) + > + nkey_parts * sizeof(KEY_PART_INFO)); > + > + DBUG_ASSERT(key_info == NULL); // prevent reallocation > + DBUG_ASSERT(nkeys <= nkey_parts); > + > + keys= nkeys; > + key_parts= nkey_parts; > + keys_for_keyread.init(0); > + keys_in_use.init(keys); > + > + > + if (!(rec_per_key= (ulong *) alloc_root(&mem_root, > + sizeof(ulong) * key_parts + > + n_length + > + (names_len + nkeys + 1)))) > + { > + error= 4; > + return TRUE; /* purecov: inspected */ > + } > + key= key_info= > + my_reinterpret_cast(KEY*) (rec_per_key + key_parts); > + bzero((char*) key_info, n_length); > + first_key_part= key_part= > + my_reinterpret_cast(KEY_PART_INFO*) (key_info + keys); > + first_keyname= keyname= > + my_reinterpret_cast(char *) (first_key_part + key_parts); > + is_keys_allocated= TRUE; > + if (key_parts == 0) > + { > + DBUG_ASSERT(keys == 0); > + is_keynames_ready= is_keyparts_ready= TRUE; > + if (is_fieldnames_ready) > + parse_names(); > + if (is_fields_ready && > + connect_indexes_and_fields(error)) > + return TRUE; > + } > + if (is_fields_allocated && final_fields_keys_allocation()) > + { > + error= 4; > + return TRUE; > + } > + return FALSE; > +} > + > + > +/** > + Add index header > + > + @param name Name of the index (could be NULL if it is > + already copied by add_index_names_as_onestring()) > + @param name_len Length of the index name (used only if name passed) > + @param flags Key flags > + @param length Length of the key (in its buffer) > + @param parts Number of parts in the index > + @param alg Index algorithm > + @param blk_size Index block size > + > + @retval pointer on the allocated index descriptor > +*/ > + > +KEY *TABLE_SHARE::add_index(char *name, uint name_len, > + uint flags, uint length, uint parts, > + enum ha_key_alg alg, uint blk_size) > +{ > + DBUG_ASSERT(key < (key_info + keys)); > + DBUG_ASSERT(key->key_length == 0); // prevent redefinition > + DBUG_ASSERT(is_keys_allocated); > + key->flags= flags; > + key->key_length= length; isn't key_length equal to the sum of keypart lengths? > + key->key_parts= parts; > + key->algorithm= alg; > + key->block_size= blk_size; > + if (name) > + { > + /* > + TODO: should be check bounds of the allocated string? > + > + Check for illegal separating characters > + */ > + DBUG_ASSERT(memchr(name, '\0', name_len) == NULL); > + DBUG_ASSERT(memchr(name, NAMES_SEP_CHAR, name_len) == NULL); > + > + if (key == key_info) > + *(keyname++)= NAMES_SEP_CHAR; why is that? > + > + memcpy(keyname, name, name_len); > + keyname+= name_len; > + *(keyname++)= NAMES_SEP_CHAR; please, don't do that. Don't ask the caller for the total length of all key names, and don't allocate them in one alloc_root. just set the pointer here: key->name= name. the caller can allocate them in one array, or independently, or whatever - don't bother enforcing anything specific here. > + > + if (key == key_info + (keys - 1)) > + { > + is_keynames_ready= TRUE; > + if (is_fieldnames_ready) > + parse_names(); > + } > + > + /* names should be all or none */ > + DBUG_ASSERT(key == key_info || (key - 1)->name != NULL); > + } > + else > + { > + /* names should be all or none */ > + DBUG_ASSERT(key == key_info || (key - 1)->name == NULL); > + } > + return key++; > +} > + > + > +/** > + Add part description to the index > + > + @param keyinfo The index where to add part > + @param fieldnr Number of the field used in the index > + @param offset Offset of the part in the key biffer do you need that? The keypart starts where the previous one ends, doesn't it? > + @param keytype Key type > + @param length Length of the part > + @param flags Flags of the part > + @param error Error code assigned here in case of error return the error instead > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +bool TABLE_SHARE::add_index_part(KEY *keyinfo, uint16 fieldnr, > + uint offset, uint16 keytype, > + uint16 length, uint16 flags, > + int &error) > +{ > + if (!keyinfo->key_part) > + { > + // first key part for the key > + keyinfo->key_part= key_part; > + keyinfo->rec_per_key= rec_per_key; this can be done as key[i].rec_per_key=key[i-1].rec_per_key+key[i-1].key_parts not in add_index_part() but later, in something like finalize_share() - function that is called at the end. where you fix all typelibs and stuff. > + } > + *rec_per_key++= 0; > + key_part->fieldnr= fieldnr; > + key_part->offset= offset; > + key_part->key_type= keytype; > + key_part->length= length; > + key_part->key_part_flag= flags; > + key_part->store_length= key_part->length; // will be fixed > + key_part++; > + > + if (key_part == first_key_part + key_parts) > + { > + is_keyparts_ready= TRUE; > + if (is_fields_ready && > + connect_indexes_and_fields(error)) > + return TRUE; > + } you don't need any is_fields_ready, etc move all that code to finalize_share() and let the caller to call it at the end, when all fields and keys are parsed. No need to try to detect this moment automatically with various cursors. > + return FALSE; > +} > + > +/** > + Allocate space for field information > + > + @param fields_count Number of the fields > + @param null_flds Number of the fields which could be NULL > + @param enum_set_count Number of fields which are ENUM or SET > + @param enum_set_values_count Sum of number of values of all fields which > + are ENUM or SET > + @param field_names_length Sum length of all fields names (string ends are not > + counted) don't ask for this (see above) > + @param enum_set_names_length Sum length of all values of all fields which > + are ENUM or SET (string ends are not counted) > + @param com_length Sum ength of the all field comments nor for this, nor enum_set_count, nor enum_set_values_count, nor enum_set_names_length > + @param handler_file handler - used to check fields/indices features > + @param tbl_com_length Length of the table comment (if present) or 0 > + @param tbl_com reference on the table comment (if present) move table comment related parameters somewhere out of "allocate_fields_space" method. > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +bool TABLE_SHARE::allocate_fields_space(uint fields_count, > + uint null_flds, > + uint enum_set_count, > + uint enum_set_values_count, > + uint field_names_length, > + uint enum_set_names_length, > + uint com_length, > + handler *handler_file, > + size_t tbl_com_length, > + char *tbl_com) > +{ > + stored_fields= fields= fields_count; > + vfields= 0; > + tmp_handler_file= handler_file; > + null_fields= null_flds; > + enum_set_values= enum_set_values_count; > + enums_sets= enum_set_count; > + field_names_length+= fields_count + 1; //add space for separators > + comments_length= com_length; > + /* add space for separators between names and intervals */ > + enum_set_names_length+= enum_set_values_count + enum_set_count * 2; > + if (!(field_ptr= field = (Field **) > + alloc_root(&mem_root, > + (uint) ((fields_count + 1) * sizeof(Field*) + > + enum_set_count * sizeof(TYPELIB) + > + field_names_length + enum_set_names_length + > + comments_length)))) > + return TRUE; /* purecov: inspected */ > + > + field_ptr[fields]= 0; // End marker > + curr_interval= intervals= (TYPELIB*) (field + fields + 1); > + names= (char *) (intervals + enum_set_count); > + curr_interval_names= names + field_names_length; > + first_comment= comment_pos= > + (char *) (names + field_names_length + enum_set_names_length); > + if (!enum_set_count) > + intervals= 0; // For better debugging > + is_fields_allocated= TRUE; > + if (is_keys_allocated && final_fields_keys_allocation()) > + return TRUE; > + comment.str= strmake_root(&mem_root, tbl_com, > + (comment.length= tbl_com_length)); > + /* init counters */ > + null_bits_are_used= (null_fields != 0); > + if (null_field_first) > + { > + null_flags= null_pos= (uchar*) default_values; > + null_bit_pos= (db_create_options & HA_OPTION_PACK_RECORD) ? 0 : 1; > + /* > + null_bytes below is only correct under the condition that > + there are no bit fields. Correct values is set below after the > + table struct is initialized > + */ > + null_bytes= (null_fields + null_bit_pos + 7) / 8; > + } > +#ifndef WE_WANT_TO_SUPPORT_VERY_OLD_FRM_FILES > + else > + { > + null_bytes= (null_fields + 7) / 8; > + null_flags= null_pos= (uchar*) (default_values + reclength - null_bytes); > + null_bit_pos= 0; > + } > +#endif we don't want to support anything but the latest frm version here. all compatibility hacks belong to open_binary_frm directly. > + use_hash= fields >= MAX_FIELDS_BEFORE_HASH; > + if (use_hash) > + use_hash= !hash_init(&name_hash, > + system_charset_info, > + fields, 0, 0, > + (hash_get_key) get_field_name, 0, 0); > + > + return FALSE; > +} > + > +bool TABLE_SHARE::final_fields_keys_allocation() see above - move this and parse_names and the likes into one function, that the caller will call at the end. don't try to detect when "the end" is. > +{ > + DBUG_ASSERT(is_fields_allocated && is_keys_allocated); > + if (!(interval_array= > + (const char **) alloc_root(&mem_root, > + (uint) ((fields + enum_set_values + > + keys + 3) * sizeof(char *))))) > + return TRUE; > + curr_interval_array= interval_array + fields + 1; > + return FALSE; > +} > + > +/** > + Internal function triggeren when all names > + (indices, fields, enum and set) are allocated and copied > + > + > + @retval FALSE OK > + @retval TRUE Error > +*/ > + > +bool TABLE_SHARE::parse_names() > +{ > + TYPELIB *interval; > + DBUG_ASSERT(is_keys_allocated && is_fields_allocated && > + is_keynames_ready); > + fix_type_pointers(&interval_array, &fieldnames, 1, &names); > + if (is_fieldnames_ready) > + fix_type_pointers(&interval_array, intervals, enums_sets, &names); > + else > + { > + /* Intervals were passed to the add_field without preparation */ > + names= curr_interval_names; > + interval_array= curr_interval_array; > + is_fieldnames_ready= TRUE; > + } > + if ((keyname= first_keyname)) > + fix_type_pointers(&interval_array, &keynames, 1, &keyname); > + if (fieldnames.count != fields) > + return TRUE; > + > + /* Set ENUM and SET lengths */ > + for (interval= intervals; > + interval < intervals + enums_sets; > + interval++) > + { > + uint count= (uint) (interval->count + 1) * sizeof(uint); > + if (!(interval->type_lengths= (uint *) alloc_root(&mem_root, count))) > + return TRUE; > + for (count= 0; count < interval->count; count++) > + { > + char *val= (char*) interval->type_names[count]; > + interval->type_lengths[count]= strlen(val); > + } > + interval->type_lengths[count]= 0; > + } > + > + return FALSE; > +} > + > +/** > + Add field description to the TABLE_SHARE > + > + @param name Field name > + @param pos Field position in the record buffer isn't it equal the end of the previous field? (with special treatment for BIT) > + @param field_length Length of the field > + @param pack_flag Flags of the field what's that? I mean, I understand that it's some set of cryptic bits, but how would an engine use that? You know what, I think we're missing a usage example. could you add it to the example engine (ha_example) support for discovery? Something like that - a table with a fixed name, say, "example_discovered_table" is created by discovery() on the example engine. That is, a fixed table name, keep it as simple as possible. Fixed table structure. Few fields, say, an int, primary key, and enum (Y,N) - or whatever. because you haven't yet done the step 2 in our plan (extracting that part of ALTER TABLE that converts TABLE_SHARE into Create_field), this example discovery won't create frm files - it'll be completely in memory. which is fine, for now. > + @param field_type Field type > + @param charset Caracter set infoemation of the field > + @param geom_type Geometry data type (for geometry fields) > + @param auto_increment Is the field auto increment > + @param enum_set Definition of ENUM or SET (for appropriate type) a complete typelib? probably it's an overkill. better to pass an array of names, and you can build a typelib internally. > + @param comm_pos Reference on the field commentary > + @param comment_length Length of the field commentary > + @param error Error code assigned here in case of error as always, you can return the error code > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +Field **TABLE_SHARE::add_field(const char *name, > + uchar *pos, > + uint32 field_length, > + uint pack_flag, > + enum_field_types field_type, > + CHARSET_INFO *charset, > + geometry_type geom_type, > + bool auto_increment, > + TYPELIB* enum_set, > + char *comm_pos, > + uint comment_length, > + int &error) > +{ > + DBUG_ASSERT(is_fields_allocated); > + utype unireg_type= get_unireg_type(auto_increment, > + !f_no_default(pack_flag), > + FALSE, > + FALSE, f_maybe_null(pack_flag), > + field_type); > + > + return add_field_int(name, pos, field_length, > + pack_flag, field_type, > + charset, geom_type, unireg_type, > + enum_set, comm_pos, comment_length, > + NULL, TRUE, error); > +} > + > + > +/** > + Add field description to the TABLE_SHARE (internal) > + > + @param name Field name > + @param pos Field position in the record buffer > + @param field_length Length of the field > + @param pack_flag Flags of the field > + @param field_type Field type > + @param charset Caracter set infoemation of the field > + @param geom_type Geometry data type (for geometry fields) > + @param unireg_type Unireg type (or check flags) > + @param auto_increment Is the field auto increment > + @param enum_set Definition of ENUM or SET (for appropriate type) > + @param comm_pos Reference on the field commentary > + @param comment_length Length of the field commentary > + @param vcol_info Virtual column information > + @param fld_stored_in_db TRUE for normal fields and persistent virtual fields > + @param error Error code assigned here in case of error > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +Field **TABLE_SHARE::add_field_int(const char *name, > + uchar *pos, > + uint32 field_length, > + uint pack_flag, > + enum_field_types field_type, > + CHARSET_INFO *charset, > + geometry_type geom_type, > + utype unireg_type, > + TYPELIB* enum_set, > + char *comm_pos, > + uint comment_length, > + Virtual_column_info *vcol_info, > + bool fld_stored_in_db, > + int &error) > +{ > + Field* reg_field; > + DBUG_ASSERT(is_fields_allocated); > + if (!is_fieldnames_ready) > + { > + if (enum_set) > + { > + copy_typelib(curr_interval, > + &curr_interval_array, enum_set, > + &curr_interval_names, NAMES_SEP_CHAR); See? it's better to get an array of names from the caller and build the typelib here - as you won't use the typelib that caller provided anyway > + enum_set= curr_interval++; > + } > + { > + uchar *tmp= (uchar*) strmov((char*) *curr_field_names, name); > + *tmp++= (uchar)NAMES_SEP_CHAR; > + *tmp= 0; > + name= curr_field_names; > + curr_field_names= (char*)tmp; > + } just like with other names - let the caller handle the allocations, you simply use the pointer that the caller provides. > + } > + reg_field = *field_ptr= > + make_field(this, pos, > + (uint32) field_length, > + null_pos, null_bit_pos, > + pack_flag, > + field_type, > + charset, > + geom_type, > + (utype) MTYP_TYPENR(unireg_type), add the cast to MTYP_TYPENR definition and remove it here (and elsewhere) > + enum_set, > + name); > + > + if (!reg_field) // Not supported field type > + { > + error= 4; > + return NULL; > + } > + reg_field->field_index= (field_ptr - field); > + reg_field->vcol_info= vcol_info; > + reg_field->stored_in_db= fld_stored_in_db; > + DBUG_ASSERT(reg_field->field_index < fields); > + if (comm_pos && comment_length) > + { > + memcpy(comment_pos, comm_pos, comment_length); same here and everywhere. I'll stop repeating "just use the pointer, let the caller handle the allocation" alternatively (here and everywhere) do alloc_root() - that is the caller gives you a pointer, and you call alloc_root() anc copy the data. Yes, it means that every string will be allocated in its own chunk. And in the _int version of the function you use the pointers. I mean something like that: TABLE_SHARE::add_field(char *name, ...) { ... return add_field_int(strdup_root(name), ... ); so, if one uses add_field, he does not need to think about memory allocations, and does not need to calculate the sum of lengths, and stuff like that. while open_binary_frm() will use add_field_int() can will pass the pointers directly into the big allocated chunk, as always. The above applies to all strings, comments, enum/set, everything. > + DBUG_ASSERT(!is_comments_ready); > + } > + else > + DBUG_ASSERT(is_comments_ready || comment_length == 0); > + if (comment_length) > + { > + reg_field->comment.str= comment_pos; > + reg_field->comment.length= comment_length; > + comment_pos+= comment_length; right, that's what I mean by "use the pointer directly, let the caller to handle the allocations". > + } > + else > + { > + reg_field->comment.str= (char *)""; > + reg_field->comment.length= 0; very minor stilistic details: in these cases I prefer to use reg_field->comment= empty_lex_string; it was introduced for exactly this purpose. > + } > + if (f_no_default(pack_flag)) > + reg_field->flags|= NO_DEFAULT_VALUE_FLAG; > + > + if (reg_field->unireg_check == UT_NEXT_NUMBER) > + found_next_number_field= field_ptr; > + if (timestamp_field == reg_field) > + timestamp_field_offset= reg_field->field_index; > + > + if (use_hash) > + { > + if (my_hash_insert(&name_hash, > + (uchar*) field_ptr)) > + { > + /* > + Set return code 8 here to indicate that an error has > + occurred but that the error message already has been > + sent (OOM). > + */ > + error= 8; > + return NULL; > + } > + } > + > + /* move null bit/byte pointers */ > + if (field_type == MYSQL_TYPE_BIT && !f_bit_as_char(pack_flag)) > + { > + null_bits_are_used= 1; > + if ((null_bit_pos+= field_length & 7) > 7) > + { > + null_pos++; > + null_bit_pos-= 8; > + } > + } > + if (!(reg_field->flags & NOT_NULL_FLAG)) > + { > + if (!(null_bit_pos= (null_bit_pos + 1) & 7)) > + null_pos++; > + } > + > + if (reg_field->field_index == fields - 1) > + { > + if (!is_fieldnames_ready) > + > + is_fields_ready= TRUE; > + if (is_keyparts_ready && > + connect_indexes_and_fields(error)) > + return NULL; > + } > + return field_ptr++; > +} > + > +/** > + Internal function which connect fields and indices (its parts) triggered > + when fields and index parts are ready > + > + @param error Error code assigned here in case of error > + > + @retval FALSE OK > + @retval TRUE Error (error assigned) > +*/ > + > +bool TABLE_SHARE::connect_indexes_and_fields(int &error) > +{ > + KEY *keyinfo; > + uint i; > + /* Fix key->name and key_part->field */ > + if (key_parts) > + { > + KEY_PART_INFO *key_part= first_key_part; > + uint prm_key=(uint) (find_type((char*) primary_key_name, > + &keynames, 3) - 1); > + longlong ha_option= tmp_handler_file->ha_table_flags(); > + keyinfo= key_info; > + > + for (uint key=0 ; key < keys ; key++, keyinfo++) > + { > + uint usable_parts= 0; > + keyinfo->name=(char*) keynames.type_names[key]; > + keyinfo->name_length= strlen(keyinfo->name); > + keyinfo->cache_name= > + (uchar*) alloc_root(&mem_root, > + table_cache_key.length+ > + keyinfo->name_length + 1); > + if (keyinfo->cache_name) // If not out of memory > + { > + uchar *pos= keyinfo->cache_name; > + memcpy(pos, table_cache_key.str, table_cache_key.length); > + memcpy(pos + table_cache_key.length, keyinfo->name, > + keyinfo->name_length+1); > + } > + > + /* Fix fulltext keys for old .frm files */ > + if (key_info[key].flags & HA_FULLTEXT) > + key_info[key].algorithm= HA_KEY_ALG_FULLTEXT; > + > + if (prm_key >= MAX_KEY && (keyinfo->flags & HA_NOSAME)) > + { > + /* > + If the UNIQUE key doesn't have NULL columns and is not a part key > + declare this as a primary key. > + */ > + prm_key= key; > + for (i= 0 ; i < keyinfo->key_parts; i++) > + { > + uint fieldnr= key_part[i].fieldnr; > + if (!fieldnr || > + field[fieldnr-1]->null_ptr || > + field[fieldnr-1]->key_length() != > + key_part[i].length) > + { > + prm_key=MAX_KEY; // Can't be used > + break; > + } > + } > + } > + > + for (i=0 ; i < keyinfo->key_parts ; key_part++,i++) > + { > + Field *fld; > + if (new_field_pack_flag <= 1) > + key_part->fieldnr= (uint16) find_field(field, > + default_values, > + (uint) key_part->offset, > + (uint) key_part->length); > + if (!key_part->fieldnr) > + { > + error= 4; // Wrong file > + return TRUE; > + } > + fld= key_part->field= field[key_part->fieldnr-1]; > + key_part->type= fld->key_type(); > + if (fld->null_ptr) > + { > + key_part->null_offset=(uint) ((uchar*) fld->null_ptr - > + default_values); > + key_part->null_bit= fld->null_bit; > + key_part->store_length+=HA_KEY_NULL_LENGTH; > + keyinfo->flags|=HA_NULL_PART_KEY; > + keyinfo->key_length+= HA_KEY_NULL_LENGTH; > + } > + if (fld->type() == MYSQL_TYPE_BLOB || > + fld->real_type() == MYSQL_TYPE_VARCHAR || > + fld->type() == MYSQL_TYPE_GEOMETRY) > + { > + if (fld->type() == MYSQL_TYPE_BLOB || > + fld->type() == MYSQL_TYPE_GEOMETRY) > + key_part->key_part_flag|= HA_BLOB_PART; > + else > + key_part->key_part_flag|= HA_VAR_LENGTH_PART; > + key_part->store_length+=HA_KEY_BLOB_LENGTH; > + keyinfo->key_length+= HA_KEY_BLOB_LENGTH; > + } > + if (fld->type() == MYSQL_TYPE_BIT) > + key_part->key_part_flag|= HA_BIT_PART; > + > + if (i == 0 && key != prm_key) > + fld->flags |= (((keyinfo->flags & HA_NOSAME) && > + (keyinfo->key_parts == 1)) ? > + UNIQUE_KEY_FLAG : MULTIPLE_KEY_FLAG); > + if (i == 0) > + fld->key_start.set_bit(key); > + if (fld->key_length() == key_part->length && > + !(fld->flags & BLOB_FLAG)) > + { > + if (tmp_handler_file->index_flags(key, i, 0) & HA_KEYREAD_ONLY) > + { > + keys_for_keyread.set_bit(key); > + fld->part_of_key.set_bit(key); > + fld->part_of_key_not_clustered.set_bit(key); > + } > + if (tmp_handler_file->index_flags(key, i, 1) & HA_READ_ORDER) > + fld->part_of_sortkey.set_bit(key); > + } > + if (!(key_part->key_part_flag & HA_REVERSE_SORT) && > + usable_parts == i) > + usable_parts++; // For FILESORT > + fld->flags|= PART_KEY_FLAG; > + if (key == prm_key) > + { > + fld->flags|= PRI_KEY_FLAG; > + /* > + If this field is part of the primary key and all keys contains > + the primary key, then we can use any key to find this column > + */ > + if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX) > + { > + if (fld->key_length() == key_part->length && > + !(fld->flags & BLOB_FLAG)) > + fld->part_of_key= keys_in_use; > + if (fld->part_of_sortkey.is_set(key)) > + fld->part_of_sortkey= keys_in_use; > + } > + } > + if (fld->key_length() != key_part->length) > + { > + key_part->key_part_flag|= HA_PART_KEY_SEG; > + } > + if (fld->real_maybe_null()) > + key_part->key_part_flag|= HA_NULL_PART; > + /* > + Sometimes we can compare key parts for equality with memcmp. > + But not always. > + */ > + if (!(key_part->key_part_flag & (HA_BLOB_PART | HA_VAR_LENGTH_PART | > + HA_BIT_PART)) && > + key_part->type != HA_KEYTYPE_FLOAT && > + key_part->type == HA_KEYTYPE_DOUBLE) > + key_part->key_part_flag|= HA_CAN_MEMCMP; > + } > + keyinfo->usable_key_parts= usable_parts; // Filesort > + > + set_if_bigger(max_key_length,keyinfo->key_length+ > + keyinfo->key_parts); > + total_key_length+= keyinfo->key_length; > + /* > + MERGE tables do not have unique indexes. But every key could be > + an unique index on the underlying MyISAM table. (Bug #10400) > + */ > + if ((keyinfo->flags & HA_NOSAME) || > + (ha_option & HA_ANY_INDEX_MAY_BE_UNIQUE)) > + set_if_bigger(max_unique_length,keyinfo->key_length); > + } > + if (prm_key < MAX_KEY && > + (keys_in_use.is_set(prm_key))) > + { > + primary_key= prm_key; > + /* > + If we are using an integer as the primary key then allow the user to > + refer to it as '_rowid' > + */ > + if (key_info[prm_key].key_parts == 1) > + { > + Field *fld= key_info[prm_key].key_part[0].field; > + if (fld && fld->result_type() == INT_RESULT) > + { > + /* note that fieldnr here (and rowid_field_offset) starts from 1 */ > + rowid_field_offset= (key_info[prm_key].key_part[0]. > + fieldnr); > + } > + } > + } > + else > + primary_key = MAX_KEY; // we do not have a primary key > + } > + else > + primary_key= MAX_KEY; > + > + return FALSE; > +} > + > /* > Read data from a binary .frm file from MySQL 3.23 - 5.0 into TABLE_SHARE > */ > @@ -747,38 +1544,53 @@ static int open_binary_frm(THD *thd, TAB > legacy_db_type < DB_TYPE_FIRST_DYNAMIC) > share->db_plugin= ha_lock_engine(NULL, > ha_checktype(thd, legacy_db_type, 0, 0)); > - share->db_create_options= db_create_options= uint2korr(head+30); > - share->db_options_in_use= share->db_create_options; > - share->mysql_version= uint4korr(head+51); > - share->null_field_first= 0; > - if (!head[32]) // New frm file in 3.23 > - { > - share->avg_row_length= uint4korr(head+34); > - share->transactional= (ha_choice) (head[39] & 3); > - share->page_checksum= (ha_choice) ((head[39] >> 2) & 3); > - share->row_type= (row_type) head[40]; > - share->table_charset= get_charset((uint) head[38],MYF(0)); > - share->null_field_first= 1; > - } > - if (!share->table_charset) > - { > - /* unknown charset in head[38] or pre-3.23 frm */ > - if (use_mb(default_charset_info)) > - { > - /* Warn that we may be changing the size of character columns */ > - sql_print_warning("'%s' had no or invalid character set, " > - "and default character set is multi-byte, " > - "so character column sizes may have changed", > - share->path.str); > - } > - share->table_charset= default_charset_info; > + > + > + { > + enum ha_choice transact= HA_CHOICE_UNDEF; > + enum ha_choice page_chcksum= HA_CHOICE_UNDEF; > + enum row_type rtype= ROW_TYPE_DEFAULT; > + CHARSET_INFO *charset= NULL; > + bool null_fld_first= 0; > + ulong avg_row_len= 0; > + if (!head[32]) // New frm file in 3.23 > + { > + avg_row_len= uint4korr(head+34); > + transact= (ha_choice) (head[39] & 3); > + page_chcksum= (ha_choice) ((head[39] >> 2) & 3); > + rtype= (row_type) head[40]; > + charset= get_charset((uint) head[38],MYF(0)); > + null_fld_first= 1; > + } > + if (!charset) > + { > + /* unknown charset in head[38] or pre-3.23 frm */ > + if (use_mb(default_charset_info)) > + { > + /* Warn that we may be changing the size of character columns */ > + sql_print_warning("'%s' had no or invalid character set, " > + "and default character set is multi-byte, " > + "so character column sizes may have changed", > + share->path.str); > + } > + charset= default_charset_info; > + } > + if (share-> > + set_init_parameters(frm_ver, > + uint4korr(head + 51), /*MySQL Version of the frm*/ > + uint2korr(head + 30), /*Create options (old)*/ > + avg_row_len, transact, page_chcksum, > + rtype, charset, null_fld_first, > + uint4korr(head+22), /*MIN_ROWS*/ > + uint4korr(head+18), /*MAX_ROWS*/ > + uint2korr(head+16), /*record length*/ > + uint2korr(head+59), /*extra_rec_buf_length*/ > + uint2korr(head+62), /*key block size*/ > + new_field_pack_flag, > + error)) I'd say you can remove this method completely - it's just a set of assignments, the caller can do them directly. better try to provide reasonable defaults (in share->init()), so that the caller would not need to assign most of those. > + goto free_and_err; > } > - share->db_record_offset= 1; > - if (db_create_options & HA_OPTION_LONG_BLOB_PTR) > - share->blob_ptr_size= portable_sizeof_char_ptr; > error=4; > - share->max_rows= uint4korr(head+18); > - share->min_rows= uint4korr(head+22); > > /* Read keyinformation */ > key_info_length= (uint) uint2korr(head+28); > @@ -787,84 +1599,85 @@ static int open_binary_frm(THD *thd, TAB > goto err; /* purecov: inspected */ > if (disk_buff[0] & 0x80) > { > - share->keys= keys= (disk_buff[1] << 7) | (disk_buff[0] & 0x7f); > - share->key_parts= key_parts= uint2korr(disk_buff+2); > + keys= (disk_buff[1] << 7) | (disk_buff[0] & 0x7f); > + key_parts= uint2korr(disk_buff+2); > } > else > { > - share->keys= keys= disk_buff[0]; > - share->key_parts= key_parts= disk_buff[1]; > + keys= disk_buff[0]; > + key_parts= disk_buff[1]; > } > - share->keys_for_keyread.init(0); > - share->keys_in_use.init(keys); > - > - n_length=keys*sizeof(KEY)+key_parts*sizeof(KEY_PART_INFO); > - if (!(keyinfo = (KEY*) alloc_root(&share->mem_root, > - n_length + uint2korr(disk_buff+4)))) > - goto err; /* purecov: inspected */ > - bzero((char*) keyinfo,n_length); > - share->key_info= keyinfo; > - key_part= my_reinterpret_cast(KEY_PART_INFO*) (keyinfo+keys); > - strpos=disk_buff+6; > - > - if (!(rec_per_key= (ulong*) alloc_root(&share->mem_root, > - sizeof(ulong)*key_parts))) > + if (share->allocate_indices_space(keys, key_parts, > + uint2korr(disk_buff + 4) - keys - 1, > + error)) > goto err; > + strpos=disk_buff+6; > > - for (i=0 ; i < keys ; i++, keyinfo++) > + for (i=0 ; i < keys ; i++) > { > if (new_frm_ver >= 3) > { > - keyinfo->flags= (uint) uint2korr(strpos) ^ HA_NOSAME; > - keyinfo->key_length= (uint) uint2korr(strpos+2); > - keyinfo->key_parts= (uint) strpos[4]; > - keyinfo->algorithm= (enum ha_key_alg) strpos[5]; > - keyinfo->block_size= uint2korr(strpos+6); > + keyinfo= share->add_index(NULL, 0, > + (uint) uint2korr(strpos) ^ HA_NOSAME, > + (uint) uint2korr(strpos + 2), > + (uint) strpos[4], (enum ha_key_alg) strpos[5], > + uint2korr(strpos + 6)); make block_size an optional parameter, or let the caller set it directly > strpos+=8; > } > else > { > - keyinfo->flags= ((uint) strpos[0]) ^ HA_NOSAME; > - keyinfo->key_length= (uint) uint2korr(strpos+1); > - keyinfo->key_parts= (uint) strpos[3]; > - keyinfo->algorithm= HA_KEY_ALG_UNDEF; > + keyinfo= share->add_index(NULL, 0, > + ((uint) strpos[0]) ^ HA_NOSAME, > + (uint) uint2korr(strpos + 1), > + (uint) strpos[3], > + HA_KEY_ALG_UNDEF, 0); > strpos+=4; > } > > - keyinfo->key_part= key_part; > - keyinfo->rec_per_key= rec_per_key; > - for (j=keyinfo->key_parts ; j-- ; key_part++) > + for (j=keyinfo->key_parts ; j-- ; ) > { > - *rec_per_key++=0; > - key_part->fieldnr= (uint16) (uint2korr(strpos) & FIELD_NR_MASK); > - key_part->offset= (uint) uint2korr(strpos+2)-1; > - key_part->key_type= (uint) uint2korr(strpos+5); > - // key_part->field= (Field*) 0; // Will be fixed later > if (new_frm_ver >= 1) > { > - key_part->key_part_flag= *(strpos+4); > - key_part->length= (uint) uint2korr(strpos+7); > + if (share->add_index_part(keyinfo, > + (uint16) > + (uint2korr(strpos) & FIELD_NR_MASK), > + (uint) uint2korr(strpos + 2) - 1, > + (uint) uint2korr(strpos + 5), > + (uint) uint2korr(strpos + 7), > + *(strpos + 4), > + error)) > + { > + DBUG_ASSERT(0); // it is not possible if keys defined first > + } > strpos+=9; > } > else > { > - key_part->length= *(strpos+4); > - key_part->key_part_flag=0; > - if (key_part->length > 128) > + uint16 length= *(strpos+4); > + uint16 flags= 0; > + if (length > 128) > { > - key_part->length&=127; /* purecov: inspected */ > - key_part->key_part_flag=HA_REVERSE_SORT; /* purecov: inspected */ > + length&= 127; /* purecov: inspected */ > + flags= HA_REVERSE_SORT; /* purecov: inspected */ > } > + if (share->add_index_part(keyinfo, > + (uint16) > + (uint2korr(strpos) & FIELD_NR_MASK), > + (uint) uint2korr(strpos+2)-1, > + (uint) uint2korr(strpos+5), > + length, flags, error)) > + { > + DBUG_ASSERT(0); // it is not possible if keys defined first > + } > strpos+=7; > } > - key_part->store_length=key_part->length; > } > } > - keynames=(char*) key_part; > - strpos+= (strmov(keynames, (char *) strpos) - keynames)+1; > > - share->reclength = uint2korr((head+16)); > - share->stored_rec_length= share->reclength; > + if (share->add_index_names_as_onestring(strpos, i)) > + goto err; No, please remove this method, let the caller do strmov as before. it's a weird thing that open_binary_frm is doing, there's no need to create an api for that, just keep it the old way. To repeat: we want to have a reasonable and sane API for storage engines to use, not an API that allows to do everything that frm format was historically forcing us to do in openfrm(). > + strpos+= i; > + > if (*(head+26) == 1) > share->system= 1; /* one-record-database */ > #ifdef HAVE_CRYPTED_FRM > @@ -1034,17 +1847,10 @@ static int open_binary_frm(THD *thd, TAB > } > DBUG_ASSERT(next_chunk <= buff_end); > } > - share->key_block_size= uint2korr(head+62); > > error=4; > - extra_rec_buf_length= uint2korr(head+59); > - rec_buff_length= ALIGN_SIZE(share->reclength + 1 + extra_rec_buf_length); > - share->rec_buff_length= rec_buff_length; > - if (!(record= (uchar *) alloc_root(&share->mem_root, > - rec_buff_length))) > - goto free_and_err; /* purecov: inspected */ > - share->default_values= record; > - if (my_pread(file, record, (size_t) share->reclength, > + /* TODO: make copy function for handler */ what does this comment mean? > + if (my_pread(file, share->default_values, (size_t) share->reclength, > record_offset, MYF(MY_NABP))) > goto free_and_err; /* purecov: inspected */ > > @@ -2785,6 +3271,27 @@ fix_type_pointers(const char ***array, T > } /* fix_type_pointers */ > > > +static void > +copy_typelib(TYPELIB *type_copy, > + const char ***array, TYPELIB *point_to_type, > + char **names, char chr) > +{ > + *((*names)++)= chr; // full compatibility, just to be safe > + type_copy->name= 0; > + type_copy->type_names= *array; > + type_copy->count= point_to_type->count; > + for (uint i= 0; i < point_to_type->count; i++) > + { > + *((*array)++) = *names; > + uchar *tmp= (uchar*) strmov((char*) *names, type_copy->type_names[i]); > + *tmp++= (uchar)0; > + *names= (char *)tmp; > + } > + *((*array)++)= NullS; /* End of type */ > + *((*names)++)= 0; > +} > + > + > TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings) > { > TYPELIB *result= (TYPELIB*) alloc_root(mem_root, sizeof(TYPELIB)); I don't understand how you handle our new table/field/index options, those that can be defined per storage engine > === modified file 'sql/table.h' > --- a/sql/table.h 2011-08-17 05:48:35 +0000 > +++ b/sql/table.h 2011-10-04 11:14:59 +0000 > @@ -484,6 +485,39 @@ typedef struct st_table_share > void *ha_data; > void (*ha_data_destroy)(void *); /* An optional destructor for ha_data. */ > > + /* > + Variables of building the TABLE_SHARE. > + > + TODO: it might have sense to make separate structure for this variables > + and deallocate it after building > + */ Agree! It would be better to remove all this added functionality (all new methods and variables) from the TABLE_SHARE and create a separate class TABLE_SHARE_builder (or whatever), and have it allocated on the stack, like int open_binary_frm( ... ) { TABLE_SHARE_builder builder(share); ... builder->add_field(...); ... ... etc ... } this looks like a cleaner approach - the builder and all its memory is destroyed when the function returns. And the TABLE_SHARE itself does not have the "building" methods - it always represents a complete and frozen table structure. > + KEY_PART_INFO *first_key_part; // pointer on parts array > + KEY_PART_INFO *key_part; // current position during key parts adding > + KEY *key; // current position during keys adding > + ulong *rec_per_key; > + const char **interval_array; > + char *first_keyname; // pointer on the first index name string > + char *keyname; // pointer on the current index name string during adding > + char *names; // array of pointers to all names used in the definition > + char *curr_interval_names; > + TYPELIB *curr_interval; > + const char **curr_interval_array; > + char *first_comment, *comment_pos; > + char *curr_field_names; > + uchar *null_flags, *null_pos; //pointers to the NULL bits during field adding > + /* Needed for fixing indices according to handler abilities and features */ > + handler *tmp_handler_file; > + Field **field_ptr; > + uint enum_set_values, enums_sets, comments_length; > + uint new_field_pack_flag; > + uchar null_bit_pos; > + bool use_hash; /* use hash for field names */ > + bool null_bits_are_used; > + /* Flags of the building progress (also used by triggers) */ > + bool is_keys_allocated, is_fields_allocated, > + is_keynames_ready, is_fieldnames_ready, is_keyparts_ready, > + is_comments_ready, is_fields_ready; > + /* end of declaration of variables for building TABLE_SHARE*/ > > /* > Set share's table cache key and update its db and table name appropriately. > @@ -652,6 +686,96 @@ typedef struct st_table_share > return (tmp_table == SYSTEM_TMP_TABLE || is_view) ? 0 : table_map_id; > } > > + /* Table_share building functions */ > + void init_metadata() > + { > + is_keys_allocated= is_fields_allocated= > + is_keynames_ready= is_fieldnames_ready= is_comments_ready= > + is_keyparts_ready= is_fields_ready= FALSE; > + } > + bool set_init_parameters(uchar frm_ver, ulong mysql_ver, uint db_create_opt, > + ulong avg_row_len, enum ha_choice transact, > + enum ha_choice page_chcksum, enum row_type rtype, > + CHARSET_INFO *charset, bool null_fld_first, > + ha_rows mi_rows, ha_rows ma_rows, > + ulong reclen, uint extra_rec_buf_len, > + uint key_blck_size, uint new_fld_pck_flg, > + int &error); > + bool allocate_indices_space(uint keys, uint parts, uint names_len, > + int &error); > + KEY *add_index(char *name, uint name_len, > + uint flags, uint length, uint parts, > + enum ha_key_alg alg, uint blk_size); > + bool add_index_part(KEY *keyinfo, uint16 fieldnr, > + uint offset, uint16 keytype, > + uint16 length, uint16 flags, int &error); > + inline bool add_index_names_as_onestring(uchar *pos, uint &len) > + { > + DBUG_ASSERT(is_keys_allocated); > + DBUG_ASSERT(keyname == first_keyname); // add_key did not used names > + len= (strmov(first_keyname, (char *) pos) - first_keyname) + 1; > + is_keynames_ready= TRUE; > + if (is_fieldnames_ready && parse_names()) > + return TRUE; > + return FALSE; > + } > + inline bool add_field_enum_set_names_as_onestring(uchar *pos, uint len) > + { > + DBUG_ASSERT(is_fields_allocated); > + memcpy((char*) names, pos, len); > + is_fieldnames_ready= TRUE; > + if (is_keynames_ready && parse_names()) > + return TRUE; > + return FALSE; > + } > + inline void add_comments_as_one_string(const uchar *pos) > + { > + DBUG_ASSERT(is_fields_allocated); > + memcpy(first_comment, pos, comments_length); > + is_comments_ready= TRUE; > + } See above, I don't think that these *_onestring functions are necessary. if you use the pointers are provided by the caller, than open_binary_frm can parse these "one strings" as it wants and pass pointers down. Thus keeping this trickery out of the api. > + > + bool allocate_fields_space(uint fields_count, > + uint null_flds, > + uint enum_set_count, > + uint enum_set_values_count, > + uint field_names_length, > + uint enum_set_names_length, > + uint com_length, > + handler *handler_file, > + size_t tbl_com_length= 0, > + char *tbl_com= NULL); > + Field **add_field(const char *name, > + uchar *pos, > + uint32 field_length, > + uint pack_flag, > + enum_field_types field_type, > + CHARSET_INFO *charset, > + geometry_type geom_type, > + bool auto_increment, > + TYPELIB* enum_set, > + char *comm_pos, > + uint comment_length, > + int &error); > + Field **add_field_int(const char *name, > + uchar *pos, > + uint32 field_length, > + uint pack_flag, > + enum_field_types field_type, > + CHARSET_INFO *charset, > + geometry_type geom_type, > + utype unireg_type, > + TYPELIB* enum_set, > + char *comment_pos, > + uint comment_length, > + Virtual_column_info *vcol_info, > + bool fld_stored_in_db, > + int &error); > +private: > + bool final_fields_keys_allocation(); > + bool parse_names(); > + bool connect_indexes_and_fields(int &error); > + > } TABLE_SHARE; > Regards, Sergei

1 0

[Maria-developers] Your push broke windows builds on 5.3
by Sergei Petrunia 11 Oct '11

11 Oct '11

Hi Serg, Your latest push into 5.3 broke compilation on Windows: http://buildbot.askmonty.org/buildbot/builders/win2008r2-vs2010-i386-packag… http://buildbot.askmonty.org/buildbot/builders/win32-debug2/builds/734/step… Could you please fix it? (If you don't have any idea what could be the cause, maybe Wlad could help us?) BR Sergey -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 3

[Maria-developers] Preparations for 5.3.2 release
by Sergey Petrunya 10 Oct '11

10 Oct '11

Hi! As discussed on the yesterday's call, we're starting to prepare for the next 5.3 release, 5.3.2 beta. The intent is to build it on this or on the next weekend. Before the release, we need to do 1. Bugs 2. optimizer_switch changes. 3. Merge from mariadb-5.1 We don't need to address: 1. Pushing Kristian's replication features. If I heard correctly, the decision was that they won't be pushed into 5.3 (please correct me if I am wrong) == Bugs == Current situation with 5.3-targeted bugs is as follows: Crashing bugs: - SergeyP: 3 + 2 non-repeatable (#860535 #860553 #861147 #860561 (non-repeatable) #860580 (non-repeatable)) - Timour: 2 (#824425 #858148) - Nobody: 1 (#859375) Wrong query result bugs: - Timour: 8 (#858038 #817966 #833777 #825051 #826150 #747278 #833702 #856152) - Igor : 2 (#823301 #791761) - Sanja: 1 (#825075) I have a slight excuse that all my crasing bugs were filed just yesterday. I'll try to fix them before the release. Another problem area is Timour's crashes + wrong query result bugs. Also, we need to assign #859375. == optimizer_switch changes == Some of the new optimizations are already sufficiently stable so that they can be made enabled by default. >From the code quality point of view, Philip's opinion is: - subquery_cache can be turned ON. - join_cache_level can be set to value higher than 1, and also various variants of BKA/Hash join may be enabled. - MRR can be enabled - index_condition_pushdown can be enabled - Materialization still has bugs, cannot be enabled. - semi-joins+materialization cannot be enabled together, there are bugs. - semi-joins without materialization cause non-repeatable crashes, so cannot be enabled yet. - FROM subqueries/derived tables optimization didn't recieve sufficient testing yet, so cannot be enabled. Note that the above is based only on the number of known crashes/wrong query result problems, performance issues are not counted. My opinion is that - subquery_cache can be enabled. - index_condition_pushdown can be enabled. - I'm hesitant to enable MRR because it may cause slowdowns for small-dataset sysbench-like tests. - perhaps, some part of hash join could be enabled (as far as I understand, its overhead is rather small, so it doesn't cause regressions?) Anybody (and especially feature "owners") have any thoughts? == Merge from MariaDB 5.1 == Monty mentioned we'll need to do it, but nobody took this task? BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

3 2

[Maria-developers] optimizer_switch default settings change for 5.3.2: status?
by Sergey Petrunya 09 Oct '11

09 Oct '11

Hi Sanja, I was wondering if you have any progress with optimizer_switch default settings change that we decided to do for the 5.3.2 release? Any ETA on when that will be pushed? BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] 5.5 merge status
by Kristian Nielsen 07 Oct '11

07 Oct '11

Hi Serg, Here is the status of my efforts to merge the rpl,binlog, and innodb suites. These are the tests that still fail after my last pust to 5.5-serg: binlog.binlog_innodb_row This fails because of a problem in my merge of group commit, I will fix. binlog.binlog_killed I do not know yet, I can take a look next week. binlog.binlog_index This fails because of missing --test-expect-abort option which you said you would re-add back. rpl.rpl_create_if_not_exists Something with CREATE IF NOT EXISTS, I believe you said you would look at this (not related to replication). rpl.rpl_variables_stm This looks like microsecond related, maybe you can check. innodb.innodb innodb.innodb_no_mrricp innodb.innodb_mysql I think we should ask someone from optimiser to take a look at these. - Kristian.

3 3

[Maria-developers] Out of semi-join bugs, time for another testing?
by Sergey Petrunya 06 Oct '11

06 Oct '11

Hi Philip, I've fixed/pushed all semi-join bugs. If I recall correctly, you intended to do more semi-join testing, now everything is ready for it. BR Sergey -- Sergey Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

Re: [Maria-developers] MySQL Bug 59449 - Accepted by MariaDB?
by Jeremy Thomerson 05 Oct '11

05 Oct '11

Cool, thank you! As I'm not very familiar with the working process between MariaDB and MySQL upstream, do you think this patch will go back upstream? My intention in my original work on it was to get a fix into all distros that track MySQL. Thanks again! Jeremy Thomerson On Wed, Oct 5, 2011 at 8:56 AM, Timour Katchaounov <timour(a)montyprogram.com>wrote: > Hello Jeremy, > > This is to inform you that I started working on > MySQL Bug 59449. In order to track the bug progress > I created a bug in Launchpad: > https://bugs.launchpad.net/**maria/+bug/861763<https://bugs.launchpad.net/maria/+bug/861763> > > If you are interested in following the progress of > this work, please subscribe to the Launchpad bug above. > > I will work on implementing the generic solution > suggested by Monty. > > Timour > > > >> Hi! >> >> "Jeremy" == Jeremy Thomerson<jeremy(a)**thomersonfamily.com<jeremy(a)thomersonfamily.com>> >>>>>>> writes: >>>>>>> >>>>>> >> Jeremy> Monty, et al... >> Jeremy> On Mon, Jun 13, 2011 at 9:36 AM, Michael Widenius< >> monty(a)askmonty.org>**wrote: >> >> >>>> Hi! >>>> >>>> "Sergei" == Sergei Golubchik<serg(a)askmonty.org> writes: >>>>>>>>> >>>>>>>> >>>> Sergei> Hi, Jeremy! >> Sergei> On Jun 10, Jeremy Thomerson wrote: >> >>> I just submitted a patch to a MySQL bug that I am also experiencing. I >>>>>> would like to see it accepted into the wider community (MySQL, >>>>>> MariaDB, >>>>>> Percona, etc). Please let me know what I need to do so that this >>>>>> patch >>>>>> could also be accepted into your project. >>>>>> >>>>>> The bug is here: http://bugs.mysql.com/bug.php?**id=59449<http://bugs.mysql.com/bug.php?id=59449> >>>>>> The "[11 Jun 3:16] Jeremy Thomerson" comment will be the most useful. >>>>>> >>>>> >>>> >> >> Sergei> But if Oracle will refuse to fix this bug, we will look at your >> >>> patch, >>>> >>> Sergei> certainly. >> >>> >>>> To ensure we don't forget about this, if you are not sure that Oracle >>>> has fixed the bug within one month, ping us and we will look at >>>> adding this into MariaDB at once. >>>> >>>> >> Jeremy> Thanks a bunch! I was away a lot in July and August and didn't >> get to >> Jeremy> follow up on this. Looking at the original bug report, I have >> seen >> Jeremy> absolutely no activity. I'm not even sure why they have not >> touched / >> Jeremy> accepted it. If anyone here knows a way to get it into one (or >> both) >> Jeremy> projects, I'd appreciate any help you can offer. >> >> The patch you suggested was: >> >> === modified file 'sql/sql_base.cc' >> --- sql/sql_base.cc 2011-04-12 10:59:59 +0000 >> +++ sql/sql_base.cc 2011-06-10 20:11:52 +0000 >> @@ -6975,6 +6975,28 @@ >> *counter= i; >> *resolution= RESOLVED_IGNORING_ALIAS; >> break; >> + } >> + else if (find->type() == Item::FUNC_ITEM&& ((Item_func*) >> find)->functype() == Item_func::COLLATE_FUNC&& ((Item_func*) >> find)->arg_count == 2) >> >> + { >> + /* >> + If someone uses "ORDER BY column_name COLLATE utf8_spanish_ci", >> it is a function >> + that we are trying to find, and not a real column. Bug #59449 >> exposes that this >> + failed when column_name is actually referring to the name of an >> alias, whether >> + that alias is for a real column or for a function result (such >> as coalesce). This >> + block of code finds the real item, which is the "column" >> referred to by the >> + collation function for this scenario. >> + */ >> + Item *collated_column = ((Item_func*) find)->arguments()[0]; >> + int is_alias = item->type() == Item::FUNC_ITEM || >> + ((item->type() == Item::FIELD_ITEM || item->type() >> == Item::REF_ITEM)&& >> + my_strcasecmp(system_charset_**info, >> ((Item_ident*) item)->field_name, item->name)); >> + if (is_alias&& collated_column->name&& item->name&& >> !my_strcasecmp(system_charset_**info, item->name, >> collated_column->name)) >> >> + { >> + found =&collated_column; >> + *counter = i; >> + *resolution = RESOLVED_BEHIND_ALIAS; >> + break; >> + } >> } >> } >> else if (table_name&& item->type() == Item::REF_ITEM&& >> >> What I don't like with the patch is that we make COLLATE a special >> case. I think that all usage of alias names in ORDER BY should be >> treated the same. >> >> In other words: >> >> ORDER BY LanguageName >> ORDER BY LanguageName COLLATE utf8_spanish_ci >> ORDER BY concat(LanguageName,"aa") >> >> should all use either the column or the alias in the same manner. >> >> As we normally prefer alias for a column name in the ORDER BY, >> I think we should fix this so that we always prefer the alias name in >> all ORDER BY context. >> >> The other option would be to give an error in this case as it's not >> clear what the user wants. This is hower likely to break many old >> applictions. >> >> After talking with Sergei, he concluded: >> >> "yes, I believe now that according to the SQL:2003 (ISO/IEC >> 9075-2:2003, part 2 (foundations), 14.1<declare cursor>, Syntax >> Rules, item 18) aliases from the select list take precedence over >> column names from the table" >> >> The standard is very vague in the area, but it seams to support the >> idea that alias'es should resolve first). >> >> This means that we should fix things to always first prefer alias. >> The fix in this case needs to be done in item::fix_fields() and not in >> sql_base.cc >> >> I will ask Timour to see if he can provide a fix for this. >> (As he knows the fix_fields code quite well and he needs something to >> bite into now when he is back from his vacation). >> >> Timour, can you handle this? >> >> Regards, >> Monty >> >

1 0

[Maria-developers] WL#240 New (by Mdcallag): client-side compressed types
by worklog-noreply＠askmonty.org 03 Oct '11

03 Oct '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: client-side compressed types CREATION DATE..: Fri, 30 Sep 2011, 20:31 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 240 (http://askmonty.org/worklog/?tid=240) VERSION........: WorkLog-4.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Is it possible to add a variant of the blob types that is compressed on the client side? By this I mean that the client library handles compression and decompression so that the client code does not have to deal with it. The benefit from this is reduced load. There will be less network traffic between client/server and master/slave. This uses less space in the binlog, relay log, innodb transaction log and database files. The alternative is to use compression between client/server and master/slave but that doesn't help with the size of the binlog file nor with the innodb datafiles or log file. We have too many cases where huge text/blob values store uncompressed JSON and the bloat from that hurts performance. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

4 4

[Maria-developers] WL#239 New (by Jaequery): ability to have multiple TIMESTAMP columns with CURRENT_TIMESTAMP / on_update TIMESTAMP
by worklog-noreply＠askmonty.org 28 Sep '11

28 Sep '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: ability to have multiple TIMESTAMP columns with CURRENT_TIMESTAMP / on_update TIMESTAMP CREATION DATE..: Wed, 28 Sep 2011, 19:37 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Client-BackLog TASK ID........: 239 (http://askmonty.org/worklog/?tid=239) VERSION........: Benchmarks-3.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Let's say I have two columns: 'created' and 'updated' Currently I can only let 'created' use the CURRENT_TIMESTAMP attribute. But ideally, I'd like 'updated' to also use CURRENT_TIMESTAMP as well as on_update TIMESTAMP. This makes a lot more sense for operations like this when a developer would have 'created', 'updated', or even 'deleted', columns. Only way we can do this right now is via triggers or (shudder) setting them from the app server. I understand there would be a underlying change and would really appreciate some kind of change for this particular behavior. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] Please review: [Commits] Rev 3199: Fix bug lp:858148. in file:///home/tsk/mprog/src/5.3/
by Igor Babaev 28 Sep '11

28 Sep '11

OK to push. Regards, Igor. On 09/28/2011 07:23 AM, Timour Katchaounov wrote: > Hi Igor, > > Could you please review the following fix. > It is very much related to a bug you fixed: > https://bugs.launchpad.net/bugs/702301 > > Thanks, > Timour > > -------- Original Message -------- > Return-Path: <commits-bounces(a)mariadb.org> > X-Original-To: timour(a)montyprogram.com > Delivered-To: timour(a)montyprogram.com > Received: from localhost (localhost.localdomain [127.0.0.1]) by > hasky.askmonty.org (Postfix) with ESMTP id DFD38D0DCB; Wed, 28 Sep > 2011 17:20:59 +0300 (EEST) > X-Virus-Scanned: Debian amavisd-new at mail.askmonty.org > Received: from hasky.askmonty.org ([127.0.0.1]) by localhost > (mail.askmonty.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP > id lpHLfsC2eNw9; Wed, 28 Sep 2011 17:20:59 +0300 (EEST) > Received: from hasky.askmonty.org (localhost.localdomain [127.0.0.1]) > by hasky.askmonty.org (Postfix) with ESMTP id BE79DC8236; Wed, 28 Sep > 2011 17:20:59 +0300 (EEST) > Received: by hasky.askmonty.org (Postfix) id 38FC0C8234; Wed, 28 Sep > 2011 17:20:58 +0300 (EEST) > Delivered-To: commits(a)mariadb.org > Received: from localhost (localhost.localdomain [127.0.0.1]) by > hasky.askmonty.org (Postfix) with ESMTP id 31622C8236 for > <commits(a)mariadb.org>; Wed, 28 Sep 2011 17:20:58 +0300 (EEST) > X-Virus-Scanned: Debian amavisd-new at mail.askmonty.org > Received: from hasky.askmonty.org ([127.0.0.1]) by localhost > (mail.askmonty.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP > id BvGNnoY8SHUx for <commits(a)mariadb.org>; Wed, 28 Sep 2011 17:20:52 > +0300 (EEST) > Received: from localhost6.localdomain6 (unknown [212.91.171.126]) > (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No > client certificate requested) by hasky.askmonty.org (Postfix) with > ESMTPSA id 24886C8234 for <commits(a)mariadb.org>; Wed, 28 Sep 2011 > 17:20:52 +0300 (EEST) > Content-Type: multipart/mixed; > boundary="===============0198351398646356273==" > MIME-Version: 1.0 > From: <timour(a)askmonty.org> > User-Agent: bzr/2.3.4 > To: <commits(a)mariadb.org> > Message-Id: <20110928142052.24886C8234(a)hasky.askmonty.org> > Date: Wed, 28 Sep 2011 17:20:52 +0300 (EEST) > Subject: [Commits] Rev 3199: Fix bug lp:858148. in > file:///home/tsk/mprog/src/5.3/ > X-BeenThere: commits(a)mariadb.org > X-Mailman-Version: 2.1.9 > Precedence: list > Reply-To: maria-developers(a)lists.launchpad.net > List-Id: MariaDB Commits List <commits.mariadb.org> > List-Unsubscribe: > <https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits>, > <mailto:commits-request@mariadb.org?subject=unsubscribe> > List-Archive: <http://lists.askmonty.org/pipermail/commits> > List-Post: <mailto:commits@mariadb.org> > List-Help: <mailto:commits-request@mariadb.org?subject=help> > List-Subscribe: > <https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits>, > <mailto:commits-request@mariadb.org?subject=subscribe> > Sender: commits-bounces(a)mariadb.org > Errors-To: commits-bounces(a)mariadb.org > > At file:///home/tsk/mprog/src/5.3/ > > ------------------------------------------------------------ > revno: 3199 > revision-id: timour(a)askmonty.org-20110928142043-b88ob3qytbroxdks > parent: psergey(a)askmonty.org-20110928090147-izz3ebqbcrnakndu > fixes bug(s): https://launchpad.net/bugs/858148 > committer: timour(a)askmonty.org > branch nick: 5.3 > timestamp: Wed 2011-09-28 17:20:43 +0300 > message: > Fix bug lp:858148. > > Analysis: > The crash is a result of the same cause as all similar > bugs (lp:827416, lp:718763, lp:778413, lp:806943, > lp:611690). The general pattern is that some optimization > requires the evaluation of some condition (e.g. the WHERE > clause), and this condition contains a subquery, such that > the subquery itself requires a temporary table for its > execution. During the subquery execution the original > tables in the FROM clause are replaced by the temporary > table needed for the final GROUP or ORDER operation. All > this happens during optimization of the outer query. Later > when EXPLAIN is run for the subquery, explain attempts to > print the name of the tables in the FROM clause, but it > finds there a temporary table without a corresponding > TABLE_LIST object. The attempt to print the name of a > NULL table list results in a crash. > > Solution: > This patch extends the fix to bug lp:702301, and dissalows > constant substitution of aggregate functions if the filter > condition used to check MIN/MAX keys is an expensive condition.

1 0

[Maria-developers] WL#238 New (by Snabb): Implement NOW() default value for DATETIME columns
by worklog-noreply＠askmonty.org 27 Sep '11

27 Sep '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Implement NOW() default value for DATETIME columns CREATION DATE..: Tue, 27 Sep 2011, 14:05 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 238 (http://askmonty.org/worklog/?tid=238) VERSION........: Server-9.x STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Have a look at MySQL bug #27645: http://bugs.mysql.com/bug.php?id=27645 Currently it is possible to set the default value of a TIMESTAMP column to CURRENT_TIME but this is not possible with DATETIME columns. Looking at that bug report it looks like I am not the only one who wishes to use DATETIME columns and have a way of setting their default value to the time when the row was created. Also TIMESTAMP DEFAULT CURRENT_TIME can occur only once in a table. It should be possible to have several "DATETIME DEFAULT NOW()" columns (as this is useful for having automatically initialized created_time and modified_time columns for a row, for example). Looks like MariaDB might gain some supporters by implementing this much-wanted feature. Currently the only decent work-around is to create a trigger which populates DATETIME columns before insert. (I hope this is the proper way to file a feature request.) ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

Re: [Maria-developers] [Commits] Rev 3192: Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] [ID | USER user_name] in lp:maria/5.3
by Sergei Golubchik 27 Sep '11

27 Sep '11

Hi, Michael! On Sep 23, Michael Widenius wrote: > revno: 3192 > revision-id: monty(a)askmonty.org-20110922221338-wxnyyd5grsn689dy > parent: sergii(a)pisem.net-20110922090400-jkxe2vagjakr4lbi > committer: Michael Widenius <monty(a)askmonty.org> > branch nick: maria-5.3 > timestamp: Fri 2011-09-23 01:13:38 +0300 > message: > Added new options to KILL. New syntax is > KILL [HARD|SOFT] [CONNECTION|QUERY] [ID | USER user_name] > - If USER is given, all threads for that user is signaled > - If SOFT is used then the KILL will not be sent to the handler. Hm. So, this is the definition? "not sent to the handler"? I liked the older version of it "not interrupt an operation that leaves the table corrupted or unusable". This definition is easier to understand for the user, who does not necessarily know or care how every particular statement is split between the server and the engine (especially, as this is different for different engines). So, the point is - no matter how this SOFT is internally implemented (by not sending to the handler or whatever), what is the official definition of this feature? What should the manual say? Currently is says "will not send the signal to storage engines" which - see above - is suboptimal, in my opinion. > This can be used to not interrupt critical things in the handler > like 'REPAIR'. > > Internally added more kill signals. This gives us more information > of why a query/connection was killed. > - KILL_SERVER is used when server is going down. In this case the > users gets ER_SHUTDOWN as the reason connection was killed. > - Changed signals to number in correct order, which makes it easier > to test how the signal should affect the code. > - New error message ER_CONNECTION_KILLED if connection was killed by > 'KILL CONNECTION'. Before we got error ER_SHUTDOWN. > > Changed names of not used parameters KILL_QUERY & KILL_CONNCTION to > mysql_kill() to not conflict with defines in the server > === modified file 'include/mysql.h.pp' > --- a/include/mysql.h.pp 2011-07-21 12:50:25 +0000 > +++ b/include/mysql.h.pp 2011-09-22 22:13:38 +0000 > @@ -67,8 +67,8 @@ enum mysql_enum_shutdown_level { > SHUTDOWN_WAIT_UPDATES= (unsigned char)(1 << 3), > SHUTDOWN_WAIT_ALL_BUFFERS= ((unsigned char)(1 << 3) << 1), > SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1, > - KILL_QUERY= 254, > - KILL_CONNECTION= 255 > + SHUTDOWN_KILL_QUERY= 254, > + SHUTDOWN_KILL_CONNECTION= 255 Why wouldn't you completely remove KILL_QUERY and KILL_CONNECTION from this enum ? Strictly speaking they are not "shutdown levels", they make no sense as arguments to mysql_shutdown(). And, as you've noticed, shutdown levels are completely ignored at the moment anyway - so nobody should miss these constants if you remove them. > }; > enum enum_cursor_type > { > > === modified file 'mysql-test/t/kill.test' > --- a/mysql-test/t/kill.test 2009-12-03 11:19:05 +0000 > +++ b/mysql-test/t/kill.test 2011-09-22 22:13:38 +0000 > @@ -337,5 +337,35 @@ SELECT 1; > > ########################################################################### > > +--echo # > +--echo # Test kill USER > +--echo # > + > +grant ALL on test.* to test@localhost; > +grant ALL on test.* to test2@localhost; > +connect (con3, localhost, test,,); > +connect (con4, localhost, test2,,); > +connection default; > +--enable_info > +kill hard query user test2@nohost; > +kill soft query user test@localhost; > +kill hard query user test@localhost; > +kill soft connection user test2; > +kill hard connection user test@localhost; What about real tests? When you kill soft actually kills (and doesn't kill) a statement. You can ask Philip to write them, I suppose. > === modified file 'sql/sql_parse.cc' > --- a/sql/sql_parse.cc 2011-09-10 15:01:27 +0000 > +++ b/sql/sql_parse.cc 2011-09-22 22:13:38 +0000 > @@ -7231,6 +7240,76 @@ uint kill_one_thread(THD *thd, ulong id, > } ... > +static uint kill_threads_for_user(THD *thd, LEX_USER *user, > + killed_state kill_signal, ha_rows *rows) > +{ > + THD *tmp; > + List<THD> threads_to_kill; > + DBUG_ENTER("kill_threads_for_user"); > + > + *rows= 0; > + > + if (thd->is_fatal_error) // If we run out of memory > + DBUG_RETURN(ER_OUT_OF_RESOURCES); > + > + DBUG_PRINT("enter", ("user: %s signal: %u", user->user.str, > + (uint) kill_signal)); > + > + VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list > + I_List_iterator<THD> it(threads); > + while ((tmp=it++)) > + { > + if (tmp->command == COM_DAEMON) > + continue; > + /* > + Check that hostname (if given) and user name matches. > + > + host.str[0] == '%' means that host name was not given. See sql_yacc.yy > + */ > + if (((user->host.str[0] == '%' && !user->host.str[1]) || > + !strcmp(tmp->security_ctx->host, user->host.str)) && > + !strcmp(tmp->security_ctx->user, user->user.str)) > + { > + if (!(thd->security_ctx->master_access & SUPER_ACL) && > + !thd->security_ctx->user_matches(tmp->security_ctx)) So, without SUPER a user can only kill his own connections with KILL USER. A question. Should "KILL USER my_name" also kill the current connection, or it should only kill all other connections? > + { > + VOID(pthread_mutex_unlock(&LOCK_thread_count)); > + DBUG_RETURN(ER_KILL_DENIED_ERROR); > + } > + if (!threads_to_kill.push_back(tmp, tmp->mem_root)) > + pthread_mutex_lock(&tmp->LOCK_thd_data); // Lock from delete > + } > + } > + VOID(pthread_mutex_unlock(&LOCK_thread_count)); > + if (!threads_to_kill.is_empty()) > + { > + List_iterator_fast<THD> it(threads_to_kill); > + THD *ptr; > + while ((ptr= it++)) > + { > + ptr->awake(kill_signal); > + pthread_mutex_unlock(&ptr->LOCK_thd_data); > + (*rows)++; > + } > + } It may be a bit problematic. You lock thd->LOCK_thd_data for many threads. This defines a specific locking order. Which sounds quite fragile - I see no guarantee that this order cannot be violated by another thread. It can be even violated by some other feature that we'll implement in the future - and we won't notice it, even your deadlock detector won't catch it, because you create the dependency only during KILL USER, and only for specific THD's. So, if we'll ever have this locking order violated, it will show up as very random lockups in the undefined future :( I would suggest to rewrite this code (if possible) to avoid locking all thd->LOCK_thd_data's at once. Note that this code doesn't have to be fast. > + DBUG_RETURN(0); > +} > + > @@ -7241,16 +7320,33 @@ uint kill_one_thread(THD *thd, ulong id, > +void sql_kill_user(THD *thd, LEX_USER *user, killed_state state) > +{ > + uint error; > + ha_rows rows; > + if (!(error= kill_threads_for_user(thd, user, state, &rows))) I don't really understand why you've created a separate kill_threads_for_user() instead of putting the code here. But ok, as you like. > + my_ok(thd, rows); > + else > + { > + /* > + This is probably ER_OUT_OF_RESOURCES, but in the future we may > + want to write the name of the user we tried to kill > + */ > + my_error(error, MYF(0), user->host.str, user->user.str); > + } > +} > + > === modified file 'storage/archive/ha_archive.cc' > --- a/storage/archive/ha_archive.cc 2011-07-05 19:46:53 +0000 > +++ b/storage/archive/ha_archive.cc 2011-09-22 22:13:38 +0000 > @@ -17,6 +17,7 @@ > #pragma implementation // gcc: Class implementation > #endif > > +#define MYSQL_SERVER 1 why? > #include "mysql_priv.h" > #include <myisam.h> > Regards, Sergei

2 2

Re: [Maria-developers] CloudLinux patches for MariaDB
by Michael Widenius 26 Sep '11

26 Sep '11

Hi! >>>>> "Sergei" == Sergei Golubchik <serg(a)askmonty.org> writes: Sergei> Hi, Michael! Sergei> On Sep 23, Michael Widenius wrote: >> === modified file 'mysql-test/r/user_limits.result' >> --- mysql-test/r/user_limits.result 2005-05-02 18:45:06 +0000 >> +++ mysql-test/r/user_limits.result 2011-09-23 11:50:40 +0000 >> @@ -65,6 +65,16 @@ select * from t1; >> connect(localhost,mysqltest_1,,test,MYSQL_PORT,MYSQL_SOCK); >> ERROR 42000: User 'mysqltest_1' has exceeded the 'max_user_connections' resource (current value: 3) >> +grant usage on *.* to mysqltest_1@localhost with max_user_connections -1; Sergei> I still think that -1 (and 0 too) as special values look like a very Sergei> unprofessional hack. I'd rather see keywords there like Sergei> with max_user_connections UNLIMITED Sergei> with max_user_connections NONE That would be harder to document and understand when you take into account how the global variable max_user_connections work. I prefer to have these work identical. Sergei> as for the SET, SHOW VARIABLES, and command-line options - we can easily Sergei> support keywords if we declare max_user_connections to be a string Sergei> variable, not numeric, and will parse it manually. That I see would be an even great hack. The 'proper' way for the future would be to change the default value of 'max_user_connections' to MAX_INT and in the future threat 0 to mean zero connections. >> === modified file 'scripts/mysql_system_tables_fix.sql' >> --- scripts/mysql_system_tables_fix.sql 2011-05-28 02:11:32 +0000 >> +++ scripts/mysql_system_tables_fix.sql 2011-09-22 21:41:45 +0000 >> @@ -326,8 +326,11 @@ UPDATE host SET Create_routine_priv=Crea >> >> # >> # Add max_user_connections resource limit >> +# this is signed in MariaDB so that if one sets it's to -1 then the user >> +# can't connect anymore. Sergei> You need one special value (-1) and to get it you cut the number of Sergei> allowed values in half. Instead, you could've kept max_user_connections Sergei> as unsigned and only reserve (uint)~0 as "cannot connect". It's a maxint; No one will *ever* have 2~31 connections. This is ok. >> switch (var->show_type()) >> { >> - case SHOW_INT: get_sys_var_safe (uint); >> + case SHOW_INT: get_sys_var_safe (int); >> case SHOW_LONG: get_sys_var_safe (ulong); >> case SHOW_LONGLONG: get_sys_var_safe (ulonglong); >> case SHOW_HA_ROWS: get_sys_var_safe (ha_rows); Sergei> This is a bit inconsistent. INT is signed, but LONG/LONGLONG are Sergei> unsigned. Do I understand correctly that there will be no way to create Sergei> an unsigned INT variable after your patch? If you want unsigned int, you just use 'long' (Most of our variables are 'long' anyway; We have only a handful of int variables and the range of MAX_INT is good enough for these). When we ever need unsigned int, we will add a SHOW_UINT. I wanted to keep the patch minimal and as no-intrusive as possible and thats why I only fixed SHOW_INT and not SHOW_LONG and SHOW_LONGLONG. It's actually a bug that SHOW_INT didn't take negative numbers before; It's supposed to work the same way as GET_INT works in my_getopt.c, which it didn't do. >> === modified file 'sql/sql_acl.cc' >> - /* Don't allow the user to connect if he has done too many queries */ >> - if ((acl_user->user_resource.questions || acl_user->user_resource.updates || >> - acl_user->user_resource.conn_per_hour || >> - acl_user->user_resource.user_conn || max_user_connections) && >> - get_or_create_user_conn(thd, >> - (opt_old_style_user_limits ? sctx->user : sctx->priv_user), >> - (opt_old_style_user_limits ? sctx->host_or_ip : sctx->priv_host), >> - &acl_user->user_resource)) >> + /* >> + Don't allow the user to connect if he has done too many queries >> + We always have to allocated this as someone may change >> + max_user_connections any time. Sergei> What do you mean? That the original code was wrong. We can *not* do the allocation based on the original 'if' as it's assumed that max_user_connections would never change. My comments explain that the we have always to call get_or_create_user_conn() because max_user_connections depends on this structure to exists. >> + */ >> + if (get_or_create_user_conn(thd, >> + (opt_old_style_user_limits ? sctx->user : >> + sctx->priv_user), >> + (opt_old_style_user_limits ? sctx->host_or_ip >> + : sctx->priv_host), >> + &acl_user->user_resource)) >> DBUG_RETURN(1); // The error is set by get_or_create_user_conn() >> } >> else >> >> === modified file 'sql/sql_connect.cc' >> --- sql/sql_connect.cc 2011-09-22 22:13:38 +0000 >> +++ sql/sql_connect.cc 2011-09-22 22:58:07 +0000 >> @@ -113,8 +113,11 @@ int check_for_max_user_connections(THD * >> DBUG_ENTER("check_for_max_user_connections"); >> >> (void) pthread_mutex_lock(&LOCK_user_conn); >> + >> + /* Root is not affected by the value of max_user_connections */ Sergei> It's an incompatible change. Why did you do it? If the point was to Sergei> allow SUPER connections when max_user_connections==-1, then it would be Sergei> enough to make only this value (-1) to be ignored by the SUPER user, and Sergei> any other value limit should still apply. root users should not be affected by the global variables max_user_connections or max_connections. Yes, it's incompatible, but ok and necessary in this case as otherwise no one could login if we set global.max_user_connections=1 which would not let you maintain the server at all. Sergei> SUPER user typically ignores features that prevent him from connecting Sergei> to the server. E.g incorrect init-connect option may do it. Or a normal Sergei> user may use up all max_connections limit and prevent SUPER from Sergei> connecting. That's why SUPER ignores init-connect and is allowed one Sergei> connection above max_connections. Sergei> But max_user_connections can not prevent SUPER from connecting (unless Sergei> it is -1). If it is set to, for example, 5, SUPER can have five Sergei> simultaneous connections and no normal user can prevent him from doing Sergei> it. This is why SUPER does *not* ignore max_user_connections. Sergei> So, by this logic, only the value max_user_connections==-1 should be Sergei> ignored by SUPER, and not any other value. I think it's better to not regard any value as special. It's easier to document it the current way; Doing it your way would make it hard to document and understand and that usually means it's a bad idea. (For example, what happens if you set max_user_connections=-1 and then later change it to 1; What limits apply to the root user that is now logged in twice). If you want to constrain the root user, you can do that with GRANT root ... max_user_connections=# Regards, Monty

1 0

[Maria-developers] SOCKET_SIZE_TYPE question on accept() call
by Steve Ellcey 24 Sep '11

24 Sep '11

Whild building mariadb on HP-UX, I ran into a problem with a call to accept(). The mariadb configure script uses MYSQL_TYPE_ACCEPT to determine if the third argument to accept should be type socklen_t or type int, and sets SOCKET_SIZE_TYPE accordingly, but in socket_accept (plugin/handler_socket/libhsclient/socket.cpp), the third argument to the accept call (addrlen_r) is hardcoded to be type socklen_t instead of using SOCKET_SIZE_TYPE. I think that the addrlen_r argument to socket_accept should be type SOCKET_SIZE_TYPE instead of socklent_t. I think this also means that the addrlen field in the socket_args structure (plugin/handler_socket/libhsclient/socket.hpp) should be type SOCKET_SIZE_TYPE instead of socklen_t. Does that sound right? Steve Ellcey sje(a)cup.hp.com

2 4

[Maria-developers] WL#237 New (by DonQuichote): more IF EXISTS clauses
by worklog-noreply＠askmonty.org 23 Sep '11

23 Sep '11

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: more IF EXISTS clauses CREATION DATE..: Fri, 23 Sep 2011, 14:10 SUPERVISOR.....: IMPLEMENTOR....: COPIES TO......: CATEGORY.......: Server-RawIdeaBin TASK ID........: 237 (http://askmonty.org/worklog/?tid=237) VERSION........: WorkLog-4.0 STATUS.........: Un-Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: It would be nice if more statements were repeatable for use in scripts (See http://www.howtoforge.com/node/4833 for the use of this). I would like to see the IF (NOT) EXISTS clauses added to the RENAME command and it would really be nice if such a clause could be added to the various operations of the ALTER TABLE command. For example: RENAME TABLE IF EXISTS WrongName TO RightName; -- when placed in an update script, it will rename the table if it still has the wrong name, but it will not fail if it already has the right name. ALTER TABLE SomeTable ADD COLUMN IF NOT EXISTS ExtraColumn VARCHAR(255) DEFAULT NULL; ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] MariaDB 5.2.9
by Daniel Bartholomew 23 Sep '11

23 Sep '11

All, Monty asked me to prep the MariaDB 5.2.9 release. He said to use the build of revision 3033 for the release: http://buildbot.askmonty.org/buildbot/grid?branch=5.2&category=package http://bazaar.launchpad.net/~maria-captains/maria/5.2/revision/3033 ...and I've uploaded the files from that build to the primary mirror. They should be mirrored worldwide by tomorrow. But before I can finish the release and announce it I need a couple of things: First, I need one of the developers to tag the release in the source tree: http://bazaar.launchpad.net/~maria-captains/maria/5.2/changes Second, I need to know if there is anything that I should be sure to mention in the release notes. One thing I can think of which hasn't been mentioned in the past few release notes is which version of MySQL that this version of MariaDB has merged in. The current versions of other things, like PBXT and XtraDB would also be helpful. Thanks. -- Daniel Bartholomew MariaDB - http://mariadb.org Monty Program - http://montyprogram.com AskMonty Knowledgebase - http://kb.askmonty.org

2 2

[Maria-developers] Building MariaDB 3.1 Beta on HP-UX
by Steve Ellcey 22 Sep '11

22 Sep '11

Hi, I have downloaded the MariaDB 3.1 Beta sources and am trying to build MariaDB on HP-UX 11.31 using the HP compilers and ran into a few problems that I wanted to ask about. The first problem I ran into was with anonymous unions (and structs). Anonymous unions are part of the C++ standard, but not C (though the GNU C compiler allows them). The header file include/ma_dyncol.h has a structure, st_dynamic_column_value, which includes both anonymous unions and anonymous structures and this file is included in both C files (mysys/ma_dyncol.c and unittest/mysys/ma_dyncol-t.c) and C++ files (sql/item_strfunc.cc). This is causing the HP C compiler problems since it doesn't allow anonymous unions (or structs) by default. Now I can use a GNU compatibility mode in the compiler (-Agcc) to allow this to compile, but that creates other problems, specifically it causes the MariaDB configure script to think I am using GCC (because __GNUC__ is defined in this mode) and then it runs the ABI check which fails because the HP compiler doesn't generate preprocessed source that exactly matches the expected GNU compiler output due to minor changes in the output. So I was wondering if this use of anonymous unions in C code was intentional or unintentional? I was also wondering about the use of the anonymous structs in the anonymous union as that is not part of the C or C++ standards, though the GNU compilers only complain about this when you use the -pedantic flag. What solution to this issue would people recommend? We could use the GNU compatibility mode with the HP compilers but would have to modify the configure script to not run the ABI check. Or we could remove the use of anonymous unions (and structs) from the C code in MariaDB. I prefer the second option because it makes the C code more consistent with the C99 standard. Steve Ellcey sje(a)cup.hp.com

2 3

[Maria-developers] MySQL Bug 59449 - Accepted by MariaDB?
by Jeremy Thomerson 21 Sep '11

21 Sep '11

I just submitted a patch to a MySQL bug that I am also experiencing. I would like to see it accepted into the wider community (MySQL, MariaDB, Percona, etc). Please let me know what I need to do so that this patch could also be accepted into your project. The bug is here: http://bugs.mysql.com/bug.php?id=59449 The "[11 Jun 3:16] Jeremy Thomerson" comment will be the most useful. Please CC me on any replies to this thread because I am not subscribed to this mailing list. Best Regards, Jeremy Thomerson

3 4

[Maria-developers] Microseconds support in MariaDB 5.3.
by Peter Laursen 21 Sep '11

21 Sep '11

I noticed: http://askmonty.org/blog/the-2-year-old-mariadb/ "The support for microseconds in TIMESTAMP, DATETIME, and TIME". I fully agree the 'full seconds support only' has been a sever limitation in MySQL. But I have two concerns with ths: 1) 'noisyness'. On not very fast systems the last digits of a TIME in microseconds should not be considered too much important. It depends on what else the system is doing at the time. I think for lots of users milliseconds and not microseconds would be better/more relevant. It is not always a lot of digits can be proven true. When we went to school we were all taught not to present results in natural sciences more accurate than the accuracy of data sources and measurements. Providing too many digits in a resuslt actually caused a lower score in my highschool! 2) Compability. There is a problem with UPDATES. A client/application written for MySQL may assume 'full seconds support only' and may generate the current MySQL format byte format in the WHERE clause (typically if the client reserves a 14 byte buffer for TIMERSTAMPS etc). In SQL: UPDATE table SET column = 'something' WHERE time_column = '01:01:01': .. this update will fail if the currently stored value is '01:01:01:010001'; and the rigth query in the context would be. UPDATE table SET column = 'something' WHERE time_column = '01:01:01:010001'; Ideally I think there should be a configuration parameter and a global variable to SET time_accuracy = full_second|millisecond|microsecond. Did somebody have considerations about same? I definitely think that lots of applications using a TIME|TIMESTAMP|DATETIME column in the WHERE-clause of an UPDATE statement will need some rewrite to be upgradable to MariaDB 5.3 -- Peter

4 5

Re: [Maria-developers] [Commits] Rev 3020: MWL#192: Non-blocking client API for libmysqlclient. in http://bazaar.launchpad.net/~maria-captains/maria/5.2
by Kristian Nielsen 20 Sep '11

20 Sep '11

Hi Monty, Please find included the patch for MWL#192, non-blocking client API, for review. This patch is against MariaDB 5.2.8, though I expect the feature will eventually be merged and pushed to MariaDB 5.5. One thing in particular I would like to ask for advice on is if there are ways to improve the integration with libmysql/NET/Vio, as you know this code much better than me. - Kristian.

2 4

[Maria-developers] strange lines in test_if_skip_sort_order()
by Sergei Golubchik 14 Sep '11

14 Sep '11

Hi. At the end of test_if_skip_sort_order() you put (in 5.3): 17959 /* 17960 orig_cond is a part of pre_idx_push_cond, 17961 no need to restore it. 17962 */ 17963 orig_cond= 0; 17964 orig_cond_saved= false; 17965 if (orig_cond_saved && !changed_key) 17966 tab->set_cond(orig_cond); Besides incorrect indentation, you set orig_cond_saved to false, and in the next line writes an if() statement that can only work if orig_cond_saved is true. If orig_cond_saved=false is correct, then this if() can be completely removed. Or, may be, orig_cond_saved should not be set to false? Regards, Sergei

1 0