lp:938977 - Query performance with join/index super slow on MariaDB 5.3.4RC

make sure that stored routines are evaluated (that is, de facto - cached) in convert_const_to_int().
revert the fix for lp:806943 because it cannot be repeated anymore.
add few tests for convert_const_to_int()

1 files changed, 0 insertions, 33 deletions

diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test
index eee0140815b..371ee016fb8 100644
--- a/mysql-test/t/subselect4.test
+++ b/mysql-test/t/subselect4.test
@@ -1485,39 +1485,6 @@ WHERE t2.f2 = (SELECT f2 FROM t3
 drop table t1,t2,t3,t4;
 
 --echo #
---echo # LP BUG#806943 Second crash with select_describe with nested subqueries in maria-5.3
---echo #
-
-CREATE TABLE t1 ( f4 int) ;
-INSERT INTO t1 VALUES (0),(0);
-
-CREATE TABLE t2 ( f2 int) ;
-
-CREATE TABLE t3 ( f1 int NOT NULL );
-
-CREATE TABLE t4 ( f2 int, f3 int) ;
-INSERT INTO t4 VALUES (8,0),(3,0);
-
-EXPLAIN SELECT *
-FROM t2, t3
-WHERE t3.f1 = (
-        SELECT SUM( f2 )
-        FROM t4
-        WHERE EXISTS (
-                SELECT DISTINCT f4
-                FROM t1));
-SELECT *
-FROM t2, t3
-WHERE t3.f1 = (
-        SELECT SUM( f2 )
-        FROM t4
-        WHERE EXISTS (
-                SELECT DISTINCT f4
-                FROM t1));
-
-drop table t1, t2, t3, t4;
-
---echo #
 --echo # LP BUG#611690 Crash in select_describe() with nested subqueries
 --echo #