Skip to content

Commit 221e1ce

Browse files
committed
WL#4745: Remove PROCEDURE ANALYZE
This patch is for 5.7: add a deprecation message.
1 parent 00ca810 commit 221e1ce

8 files changed

+70
-1
lines changed

mysql-test/r/analyze.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ test.t1 analyze status OK
4141
drop table t1;
4242
CREATE TABLE t1 (a int);
4343
prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";
44+
Warnings:
45+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
4446
execute stmt1;
4547
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
4648
execute stmt1;

mysql-test/r/func_analyse.result

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,40 @@ insert into t1 values (1,2,"","Y","2002-03-03"), (3,4,"","N","2002-03-04"), (5,6
44
select count(*) from t1 procedure analyse();
55
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
66
count(*) 4 4 1 1 0 0 4.0000 0.0000 ENUM('4') NOT NULL
7+
Warnings:
8+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
79
select * from t1 procedure analyse();
810
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
911
test.t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL
1012
test.t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL
1113
test.t1.empty_string 0 0 4 0 0.0000 NULL CHAR(0) NOT NULL
1214
test.t1.bool N Y 1 1 0 0 1.0000 NULL ENUM('N','Y') NOT NULL
1315
test.t1.d 2002-03-03 2002-03-05 10 10 0 0 10.0000 NULL ENUM('2002-03-03','2002-03-04','2002-03-05') NOT NULL
16+
Warnings:
17+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
1418
select * from t1 procedure analyse(2);
1519
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
1620
test.t1.i 1 7 1 1 0 0 4.0000 2.2361 TINYINT(1) UNSIGNED NOT NULL
1721
test.t1.j 2 8 1 1 0 0 5.0000 2.2361 TINYINT(1) UNSIGNED NOT NULL
1822
test.t1.empty_string 0 0 4 0 0.0000 NULL CHAR(0) NOT NULL
1923
test.t1.bool N Y 1 1 0 0 1.0000 NULL ENUM('N','Y') NOT NULL
2024
test.t1.d 2002-03-03 2002-03-05 10 10 0 0 10.0000 NULL ENUM('2002-03-03','2002-03-04','2002-03-05') NOT NULL
25+
Warnings:
26+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
2127
create table t2 select * from t1 procedure analyse();
2228
ERROR HY000: Incorrect usage of PROCEDURE and non-SELECT
2329
drop table t1;
2430
SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE();
2531
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
2632
1 1 1 1 1 0 0 1.0000 0.0000 ENUM('1') NOT NULL
33+
Warnings:
34+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
2735
EXPLAIN SELECT 1 FROM (SELECT 1) a PROCEDURE ANALYSE();
2836
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
2937
1 PRIMARY <derived2> NULL system NULL NULL NULL NULL 1 100.00 NULL
3038
2 DERIVED NULL NULL NULL NULL NULL NULL NULL NULL NULL No tables used
3139
Warnings:
40+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
3241
Note 1003 /* select#1 */ select 1 AS `1` from dual
3342
EXPLAIN SELECT 1 FROM (SELECT 1) a;
3443
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
@@ -41,19 +50,25 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),(
4150
select * from t1 procedure analyse();
4251
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
4352
test.t1.v " \\ 1 19 0 0 3.7619 NULL ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') NOT NULL
53+
Warnings:
54+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
4455
drop table t1;
4556
create table t1 (df decimal(5,1));
4657
insert into t1 values(1.1);
4758
insert into t1 values(2.2);
4859
select * from t1 procedure analyse();
4960
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
5061
test.t1.df 1.1 2.2 13 13 0 0 1.65000 0.55000 ENUM('1.1','2.2') NOT NULL
62+
Warnings:
63+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
5164
drop table t1;
5265
create table t1 (d double);
5366
insert into t1 values (100000);
5467
select * from t1 procedure analyse (1,1);
5568
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
5669
test.t1.d 100000 100000 6 6 0 0 100000 0 MEDIUMINT(6) UNSIGNED NOT NULL
70+
Warnings:
71+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
5772
drop table t1;
5873
create table t1 (product varchar(32), country_id int not null, year int,
5974
profit int);
@@ -87,18 +102,26 @@ Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_
87102
test.t1.product Calculator TV 2 10 0 0 5.4000 NULL ENUM('Calculator','Computer','Phone','TV') NOT NULL
88103
sum(profit) 10 6900 11 11 0 0 1677.0000 2620.8426 ENUM('10','275','600','6900') NOT NULL
89104
avg(profit) 10.0000 1380.0000 16 16 0 0 339.75000000 521.70417863 ENUM('10.0000','68.7500','120.0000','1380.0000') NOT NULL
105+
Warnings:
106+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
90107
drop table t1,t2;
91108
create table t1 (f1 double(10,5), f2 char(10), f3 double(10,5));
92109
insert into t1 values (5.999, "5.9999", 5.99999), (9.555, "9.5555", 9.55555);
93110
select f1 from t1 procedure analyse(1, 1);
94111
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
95112
test.t1.f1 5.99900 9.55500 7 7 0 0 7.77700 1.77800 FLOAT(4,3) NOT NULL
113+
Warnings:
114+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
96115
select f2 from t1 procedure analyse(1, 1);
97116
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
98117
test.t1.f2 5.9999 9.5555 6 6 0 0 6.0000 NULL FLOAT(5,4) UNSIGNED NOT NULL
118+
Warnings:
119+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
99120
select f3 from t1 procedure analyse(1, 1);
100121
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
101122
test.t1.f3 5.99999 9.55555 7 7 0 0 7.77777 1.77778 FLOAT(6,5) NOT NULL
123+
Warnings:
124+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
102125
drop table t1;
103126
set @optimizer_switch_saved=@@session.optimizer_switch;
104127
set optimizer_switch='derived_merge=off';
@@ -117,6 +140,8 @@ d.h NULL NULL 0 0 0 1 0.0 0.0 CHAR(0)
117140
d.i NULL NULL 0 0 0 1 0.0 0.0 CHAR(0)
118141
d.j NULL NULL 0 0 0 1 0.0 0.0 CHAR(0)
119142
d.k NULL NULL 0 0 0 1 0.0 0.0 CHAR(0)
143+
Warnings:
144+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
120145
DROP TABLE t1;
121146
set @@session.optimizer_switch=@optimizer_switch_saved;
122147
End of 4.1 tests
@@ -150,6 +175,8 @@ v1.h NULL NULL 0 0 0 2 0.0 0.0 CHAR(0)
150175
v1.i NULL NULL 0 0 0 2 0.0 0.0 CHAR(0)
151176
v1.j NULL NULL 0 0 0 2 0.0 0.0 CHAR(0)
152177
v1.k NULL NULL 0 0 0 2 0.0 0.0 CHAR(0)
178+
Warnings:
179+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
153180
#should not crash
154181
SELECT * FROM t1 a, v1, t1 b PROCEDURE analyse();
155182
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
@@ -186,15 +213,23 @@ test.b.h NULL NULL 0 0 0 8 0.0 0.0 CHAR(0)
186213
test.b.i NULL NULL 0 0 0 8 0.0 0.0 CHAR(0)
187214
test.b.j NULL NULL 0 0 0 8 0.0 0.0 CHAR(0)
188215
test.b.k NULL NULL 0 0 0 8 0.0 0.0 CHAR(0)
216+
Warnings:
217+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
189218
#should not crash
190219
SELECT * FROM (SELECT * FROM t1 having a > 1) x PROCEDURE analyse();
191220
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
221+
Warnings:
222+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
192223
#should not crash
193224
SELECT * FROM t1 a, (SELECT * FROM t1 having a > 1) x, t1 b PROCEDURE analyse();
194225
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
226+
Warnings:
227+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
195228
#should not crash
196229
SELECT 1 FROM t1 group by a having a > 1 order by 1 PROCEDURE analyse();
197230
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
231+
Warnings:
232+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
198233
DROP VIEW v1;
199234
DROP TABLE t1;
200235
CREATE TABLE t1(a INT);
@@ -215,6 +250,8 @@ INSERT INTO t1 VALUES ('e'),('e'),('e-');
215250
SELECT * FROM t1 PROCEDURE ANALYSE();
216251
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
217252
test.t1.a e e- 1 2 0 0 1.3333 NULL ENUM('e','e-') NOT NULL
253+
Warnings:
254+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
218255
DROP TABLE t1;
219256
#
220257
# Bug#11756242 48137: PROCEDURE ANALYSE() LEAKS MEMORY WHEN RETURNING NULL
@@ -225,9 +262,13 @@ INSERT INTO t2 VALUES (1);
225262
SELECT DISTINCTROW f1 FROM t1 NATURAL RIGHT OUTER JOIN t2 PROCEDURE ANALYSE();
226263
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
227264
test.t1.f1 NULL NULL 0 0 0 1 0.0 0.0 CHAR(0)
265+
Warnings:
266+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
228267
SELECT * FROM t2 LIMIT 1 PROCEDURE ANALYSE();
229268
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
230269
test.t2.f2 1 1 1 1 0 0 1.0000 0.0000 ENUM('1') NOT NULL
270+
Warnings:
271+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
231272
DROP TABLE t1, t2;
232273
End of 5.1 tests
233274
#
@@ -264,9 +305,13 @@ CREATE TABLE t1 (a INT);
264305
# Trivial query:
265306
SELECT * FROM t1 PROCEDURE ANALYSE();
266307
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
308+
Warnings:
309+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
267310
# PROCEDURE ANALYSE in PS:
268311
INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
269312
PREPARE stmt1 FROM "SELECT * FROM t1 PROCEDURE ANALYSE()";
313+
Warnings:
314+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
270315
EXECUTE stmt1;
271316
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
272317
test.t1.a 1 5 1 1 0 0 3.0000 1.4142 ENUM('1','2','3','4','5') NOT NULL
@@ -282,9 +327,13 @@ CREATE PROCEDURE p1()
282327
BEGIN
283328
SELECT * FROM t1 PROCEDURE ANALYSE();
284329
END;|
330+
Warnings:
331+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
285332
CALL p1();
286333
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
287334
test.t1.a 1 5 1 1 0 0 3.0000 1.4142 ENUM('1','2','3','4','5') NOT NULL
335+
Warnings:
336+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
288337
DROP PROCEDURE p1;
289338
# PROCEDURE ANALYSE in SP cursor:
290339
CREATE PROCEDURE p1()
@@ -302,7 +351,11 @@ END IF;
302351
END LOOP;
303352
CLOSE cur1;
304353
END;|
354+
Warnings:
355+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
305356
CALL p1();
357+
Warnings:
358+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
306359
DROP PROCEDURE p1;
307360
# EXPLAIN with or wihtout PROCEDURE ANALYSE should be same:
308361
ANALYZE TABLE t1;
@@ -317,6 +370,7 @@ id select_type table partitions type possible_keys key key_len ref rows filtered
317370
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 5 100.00 NULL
318371
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 5 20.00 Using where; Using join buffer (Block Nested Loop)
319372
Warnings:
373+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
320374
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`a` AS `a` from `test`.`t1` join `test`.`t1` where (`test`.`t1`.`a` = `test`.`t1`.`a`)
321375
CREATE TABLE t2 (i INT, j INT);
322376
# PROCEDURE ANALYSE ignores ROLLUP rows:
@@ -332,15 +386,21 @@ SELECT i, AVG(j) FROM t2 GROUP BY i WITH ROLLUP PROCEDURE ANALYSE();
332386
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
333387
test.t2.i 1 4 1 1 0 0 2.8000 1.1662 ENUM('1','2','3','4') NOT NULL
334388
AVG(j) 1.0000 4.0000 16 16 0 0 2.80000000 1.16619038 ENUM('1.0000','2.0000','3.0000','4.0000') NOT NULL
389+
Warnings:
390+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
335391
SELECT i, AVG(j) FROM t2 GROUP BY i PROCEDURE ANALYSE();
336392
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
337393
test.t2.i 1 4 1 1 0 0 2.5000 1.1180 ENUM('1','2','3','4') NOT NULL
338394
AVG(j) 1.0000 4.0000 16 16 0 0 2.50000000 1.11803399 ENUM('1.0000','2.0000','3.0000','4.0000') NOT NULL
395+
Warnings:
396+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
339397
# LIMIT affects original SELECT output, not PROCEDURE ANALYSE output:
340398
SELECT * FROM t2 LIMIT 1 PROCEDURE ANALYSE();
341399
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
342400
test.t2.i 1 1 1 1 0 0 1.0000 0.0000 ENUM('1') NOT NULL
343401
test.t2.j 1 1 1 1 0 0 1.0000 0.0000 ENUM('1') NOT NULL
402+
Warnings:
403+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
344404
# Wrong usage: CREATE TABLE/VIEW and INSERT from SELECT:
345405
CREATE TABLE t SELECT * FROM t1 PROCEDURE ANALYSE();
346406
ERROR HY000: Incorrect usage of PROCEDURE and non-SELECT

mysql-test/r/parser.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1
732732
PROCEDURE ANALYSE() FOR UPDATE;
733733
Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype
734734
1 1 1 1 1 0 0 1.0000 0.0000 ENUM('1') NOT NULL
735+
Warnings:
736+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
735737
SELECT 1 FROM
736738
(SELECT 1 FROM DUAL WHERE 1 GROUP BY 1 HAVING 1 ORDER BY 1
737739
FOR UPDATE) a;

mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ id select_type table partitions type possible_keys key key_len ref rows filtered
396396
1 SIMPLE t2 p0,p1,p2,p3,p4,p5,p6,p7 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Using join buffer (Batched Key Access)
397397
Warnings:
398398
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
399+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
399400
Note 1003 Cannot push table 't2' as child of table 't1'. Doing so would prevent using join buffer for table 't2'.
400401
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))
401402
explain extended

mysql-test/suite/ndb/r/ndb_join_pushdown_default.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ id select_type table partitions type possible_keys key key_len ref rows filtered
379379
1 SIMPLE t2 p0,p1,p2,p3,p4,p5,p6,p7 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1
380380
Warnings:
381381
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
382+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
382383
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))
383384
explain extended
384385
select *

mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ id select_type table partitions type possible_keys key key_len ref rows filtered
377377
1 SIMPLE t2 p0,p1,p2,p3,p4,p5,p6,p7 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1
378378
Warnings:
379379
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
380+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
380381
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))
381382
explain extended
382383
select *

mysql-test/suite/ndb/r/ndb_join_pushdown_none.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@ id select_type table partitions type possible_keys key key_len ref rows filtered
379379
1 SIMPLE t2 p0,p1,p2,p3,p4,p5,p6,p7 eq_ref PRIMARY PRIMARY 8 test.t1.c,test.t1.d 1 100.00 Child of 't1' in pushed join@1
380380
Warnings:
381381
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
382+
Warning 1681 'PROCEDURE ANALYSE' is deprecated and will be removed in a future release.
382383
Note 1003 /* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c`,`test`.`t1`.`d` AS `d`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c`,`test`.`t2`.`d` AS `d` from `test`.`t1` join `test`.`t1` `t2` where ((`test`.`t2`.`b` = `test`.`t1`.`d`) and (`test`.`t2`.`a` = `test`.`t1`.`c`))
383384
explain extended
384385
select *

sql/sql_yacc.yy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2016 Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2017 Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -10993,6 +10993,7 @@ opt_procedure_analyse_clause:
1099310993
| PROCEDURE_SYM ANALYSE_SYM
1099410994
'(' opt_procedure_analyse_params ')'
1099510995
{
10996+
push_deprecated_warn_no_replacement(YYTHD, "PROCEDURE ANALYSE");
1099610997
$$= NEW_PTN PT_procedure_analyse($4);
1099710998
}
1099810999
;

0 commit comments

Comments
 (0)