3627 Jorgen Loland 2011-11-18
BUG#13400713: Followup patch:
- consistently use tmp as abreviation for temporary
in optimizer trace
- fixed test issue in opt_trace.general.inc
modified:
mysql-test/suite/opt_trace/include/general.inc
mysql-test/suite/opt_trace/r/charset.result
mysql-test/suite/opt_trace/r/filesort_pq.result
mysql-test/suite/opt_trace/r/general2_no_prot.result
mysql-test/suite/opt_trace/r/general2_ps_prot.result
mysql-test/suite/opt_trace/r/general_no_prot_none.result
mysql-test/suite/opt_trace/r/general_ps_prot_none.result
mysql-test/suite/opt_trace/r/range_no_prot.result
mysql-test/suite/opt_trace/r/range_ps_prot.result
mysql-test/suite/opt_trace/r/security_no_prot.result
mysql-test/suite/opt_trace/r/security_ps_prot.result
mysql-test/suite/opt_trace/r/subquery_no_prot.result
mysql-test/suite/opt_trace/r/subquery_ps_prot.result
mysql-test/suite/opt_trace/r/temp_table.result
sql/sql_select.cc
3626 Vinay Fisrekar 2011-11-18
Bug#13400194 - fix windows test failure issues
modified:
mysql-test/suite/innodb_fts/r/innodb_fts_large_records.result
mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test
=== modified file 'mysql-test/suite/opt_trace/include/general.inc'
--- a/mysql-test/suite/opt_trace/include/general.inc 2011-11-08 07:51:49 +0000
+++ b/mysql-test/suite/opt_trace/include/general.inc 2011-11-18 14:51:40 +0000
@@ -82,12 +82,12 @@ select * from information_schema.OPTIMIZ
select (@query:=QUERY)+NULL, (@trace:=TRACE)+NULL from information_schema.OPTIMIZER_TRACE;
select length(@trace);
# The concatenation of query and trace above has length:
-# - >13500 in normal mode
-# - <13500 in ps-protocol mode (because IN->EXISTS is done at PREPARE
+# - >13900 in normal mode
+# - <13900 in ps-protocol mode (because IN->EXISTS is done at PREPARE
# and we trace only EXECUTE)
# - So in normal mode, the lines below verify truncation,
# whereas in ps-protocol mode they verify non-truncation.
-set optimizer_trace_max_mem_size=13500;
+set optimizer_trace_max_mem_size=13900;
select length(@query)+length(@trace) > @@optimizer_trace_max_mem_size;
SELECT * FROM t5 WHERE 5 IN (SELECT 1 FROM t6 WHERE d = ifnull(c,null) UNION SELECT 2 FROM t6 WHERE d = ifnull(c,null));
select (@missing_bytes:=missing_bytes_beyond_max_mem_size) from information_schema.OPTIMIZER_TRACE;
=== modified file 'mysql-test/suite/opt_trace/r/charset.result'
--- a/mysql-test/suite/opt_trace/r/charset.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/charset.result 2011-11-18 14:51:40 +0000
@@ -234,7 +234,7 @@ select * from v1 where v1.col = 'ÁÂÃ� },
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 7,
@@ -242,7 +242,7 @@ select * from v1 where v1.col = 'ÁÂÃ� "unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 149796
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/filesort_pq.result'
--- a/mysql-test/suite/opt_trace/r/filesort_pq.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/filesort_pq.result 2011-11-18 14:51:40 +0000
@@ -1553,7 +1553,7 @@ SELECT * from t1 ORDER BY rand(2) LIMIT
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 219,
@@ -3948,7 +3948,7 @@ ORDER BY tmp.f1, f0 LIMIT 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 235,
@@ -4236,7 +4236,7 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 235,
@@ -4529,7 +4529,7 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 235,
@@ -4850,7 +4850,7 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 235,
@@ -5167,7 +5167,7 @@ SELECT * FROM v1 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 210,
@@ -5477,7 +5477,7 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 210,
@@ -6126,7 +6126,7 @@ LIMIT 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 210,
@@ -6139,7 +6139,7 @@ LIMIT 30 {
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v2",
"row_length": 210,
@@ -6152,7 +6152,7 @@ LIMIT 30 {
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 419,
@@ -6417,7 +6417,7 @@ GROUP BY 1 ORDER BY 2,1 LIMIT 5 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 18,
@@ -7340,7 +7340,7 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 210,
@@ -7758,7 +7758,7 @@ ORDER BY d1.f2 DESC LIMIT 30 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "d1",
"row_length": 210,
@@ -7771,7 +7771,7 @@ ORDER BY d1.f2 DESC LIMIT 30 {
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 206,
=== modified file 'mysql-test/suite/opt_trace/r/general2_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-11-18 14:51:40 +0000
@@ -955,7 +955,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 3,
@@ -963,7 +963,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 349525
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1347,7 +1347,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "teeone",
"row_length": 16,
@@ -1355,7 +1355,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 65536
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1364,7 +1364,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 22,
@@ -1372,7 +1372,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 47662
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -3688,7 +3688,7 @@ select 497, tmp.ID, NULL from (select 49
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "tmp",
"row_length": 10,
@@ -3696,7 +3696,7 @@ select 497, tmp.ID, NULL from (select 49
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 104857
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -4897,7 +4897,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 18,
@@ -4905,7 +4905,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 58254
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/general2_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-11-18 14:51:40 +0000
@@ -973,7 +973,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 3,
@@ -981,7 +981,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 349525
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1365,7 +1365,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "teeone",
"row_length": 16,
@@ -1373,7 +1373,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 65536
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1382,7 +1382,7 @@ TRACE
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 22,
@@ -1390,7 +1390,7 @@ TRACE
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 47662
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -3741,7 +3741,7 @@ select 497, tmp.ID, NULL from (select 49
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "tmp",
"row_length": 10,
@@ -3749,7 +3749,7 @@ select 497, tmp.ID, NULL from (select 49
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 104857
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -4950,7 +4950,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 18,
@@ -4958,7 +4958,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 58254
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/general_no_prot_none.result'
--- a/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-11-18 14:51:40 +0000
@@ -611,7 +611,7 @@ SELECT (SELECT 1 FROM t6 WHERE d = ifnul
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
@@ -619,7 +619,7 @@ SELECT (SELECT 1 FROM t6 WHERE d = ifnul
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 116508
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1059,7 +1059,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
@@ -1067,7 +1067,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 116508
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1342,8 +1342,8 @@ select (@query:=QUERY)+NULL, (@trace:=TR
NULL NULL
select length(@trace);
length(@trace)
-14565
-set optimizer_trace_max_mem_size=13500;
+14553
+set optimizer_trace_max_mem_size=13900;
select length(@query)+length(@trace) > @@optimizer_trace_max_mem_size;
length(@query)+length(@trace) > @@optimizer_trace_max_mem_size
1
@@ -1351,7 +1351,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
c
select (@missing_bytes:=missing_bytes_beyond_max_mem_size) from information_schema.OPTIMIZER_TRACE;
(@missing_bytes:=missing_bytes_beyond_max_mem_size)
-1187
+777
select (@query2:=QUERY)+NULL,(@trace2:=TRACE)+NULL from information_schema.OPTIMIZER_TRACE;
(@query2:=QUERY)+NULL (@trace2:=TRACE)+NULL
NULL NULL
@@ -1359,7 +1359,7 @@ select length(@trace2),
(length(@trace2) + @missing_bytes) = length(@trace),
@query2 = @query;
length(@trace2) (length(@trace2) + @missing_bytes) = length(@trace) @query2 = @query
-13378 1 1
+13776 1 1
select length(@query2) + length(@trace2)
between (@@optimizer_trace_max_mem_size-200) and (@@optimizer_trace_max_mem_size+200);
length(@query2) + length(@trace2)
@@ -4018,7 +4018,7 @@ SELECT * FROM t1 WHERE c1=5 UNION SELECT
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 5,
@@ -4026,7 +4026,7 @@ SELECT * FROM t1 WHERE c1=5 UNION SELECT
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -5857,7 +5857,7 @@ trace
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 30,
@@ -5865,7 +5865,7 @@ trace
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 34952
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -6262,7 +6262,7 @@ insert into t6 select * from t6 where d>
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 5,
@@ -6270,7 +6270,7 @@ insert into t6 select * from t6 where d>
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
}
] /* steps */
@@ -6432,7 +6432,7 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 12,
@@ -6440,7 +6440,7 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 87381
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10409,7 +10409,7 @@ explain select * from v1 where id="b" {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 21,
@@ -10417,7 +10417,7 @@ explain select * from v1 where id="b" {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 49932
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10444,7 +10444,7 @@ VARIABLE_NAME="optimizer_trace" {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "information_schema",
"table": "session_variables",
"row_length": 3268,
@@ -10452,7 +10452,7 @@ VARIABLE_NAME="optimizer_trace" {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 320
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10603,7 +10603,7 @@ select TRACE into dumpfile 'MYSQLTEST_VA
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
=== modified file 'mysql-test/suite/opt_trace/r/general_ps_prot_none.result'
--- a/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-11-18 14:51:40 +0000
@@ -611,7 +611,7 @@ SELECT (SELECT 1 FROM t6 WHERE d = ifnul
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
@@ -619,7 +619,7 @@ SELECT (SELECT 1 FROM t6 WHERE d = ifnul
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 116508
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1039,7 +1039,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
@@ -1047,7 +1047,7 @@ SELECT * FROM t5 WHERE 5 IN (SELECT 1 FR
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 116508
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -1322,16 +1322,16 @@ select (@query:=QUERY)+NULL, (@trace:=TR
NULL NULL
select length(@trace);
length(@trace)
-13787
-set optimizer_trace_max_mem_size=13500;
+13775
+set optimizer_trace_max_mem_size=13900;
select length(@query)+length(@trace) > @@optimizer_trace_max_mem_size;
length(@query)+length(@trace) > @@optimizer_trace_max_mem_size
-1
+0
SELECT * FROM t5 WHERE 5 IN (SELECT 1 FROM t6 WHERE d = ifnull(c,null) UNION SELECT 2 FROM t6 WHERE d = ifnull(c,null));
c
select (@missing_bytes:=missing_bytes_beyond_max_mem_size) from information_schema.OPTIMIZER_TRACE;
(@missing_bytes:=missing_bytes_beyond_max_mem_size)
-403
+0
select (@query2:=QUERY)+NULL,(@trace2:=TRACE)+NULL from information_schema.OPTIMIZER_TRACE;
(@query2:=QUERY)+NULL (@trace2:=TRACE)+NULL
NULL NULL
@@ -1339,7 +1339,7 @@ select length(@trace2),
(length(@trace2) + @missing_bytes) = length(@trace),
@query2 = @query;
length(@trace2) (length(@trace2) + @missing_bytes) = length(@trace) @query2 = @query
-13384 1 1
+13775 1 1
select length(@query2) + length(@trace2)
between (@@optimizer_trace_max_mem_size-200) and (@@optimizer_trace_max_mem_size+200);
length(@query2) + length(@trace2)
@@ -3988,7 +3988,7 @@ SELECT * FROM t1 WHERE c1=5 UNION SELECT
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 5,
@@ -3996,7 +3996,7 @@ SELECT * FROM t1 WHERE c1=5 UNION SELECT
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -5815,7 +5815,7 @@ trace
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 30,
@@ -5823,7 +5823,7 @@ trace
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 34952
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -6220,7 +6220,7 @@ insert into t6 select * from t6 where d>
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 5,
@@ -6228,7 +6228,7 @@ insert into t6 select * from t6 where d>
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
}
] /* steps */
@@ -6390,7 +6390,7 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 12,
@@ -6398,7 +6398,7 @@ update t5, t6 set t6.d=t6.d+t5.c+4-t5.c-
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 87381
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10325,7 +10325,7 @@ explain select * from v1 where id="b" {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "v1",
"row_length": 21,
@@ -10333,7 +10333,7 @@ explain select * from v1 where id="b" {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 49932
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10360,7 +10360,7 @@ VARIABLE_NAME="optimizer_trace" {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "information_schema",
"table": "session_variables",
"row_length": 3268,
@@ -10368,7 +10368,7 @@ VARIABLE_NAME="optimizer_trace" {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 320
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -10519,7 +10519,7 @@ select TRACE into dumpfile 'MYSQLTEST_VA
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "",
"row_length": 9,
=== modified file 'mysql-test/suite/opt_trace/r/range_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-11-18 14:51:40 +0000
@@ -3946,7 +3946,7 @@ EXPLAIN SELECT 1 FROM
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "d2",
"row_length": 5,
@@ -3954,7 +3954,7 @@ EXPLAIN SELECT 1 FROM
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -4297,7 +4297,7 @@ EXPLAIN SELECT 1 FROM
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "d2",
"row_length": 5,
@@ -4305,7 +4305,7 @@ EXPLAIN SELECT 1 FROM
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/range_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-11-18 14:51:40 +0000
@@ -3946,7 +3946,7 @@ EXPLAIN SELECT 1 FROM
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "d2",
"row_length": 5,
@@ -3954,7 +3954,7 @@ EXPLAIN SELECT 1 FROM
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -4297,7 +4297,7 @@ EXPLAIN SELECT 1 FROM
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "d2",
"row_length": 5,
@@ -4305,7 +4305,7 @@ EXPLAIN SELECT 1 FROM
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 209715
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/security_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/security_no_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/security_no_prot.result 2011-11-18 14:51:40 +0000
@@ -869,7 +869,7 @@ insert into t2 values(current_user());
select QUERY, length(TRACE), INSUFFICIENT_PRIVILEGES from information_schema.OPTIMIZER_TRACE;
QUERY length(TRACE) INSUFFICIENT_PRIVILEGES
insert into t2 values(current_user()) 20 0
-insert into t3 select * from t3 2688 0
+insert into t3 select * from t3 2682 0
# Trace exposed body of trigger, and content of t2/t3, which we
# could see anyway:
show create trigger trg2;
@@ -888,7 +888,7 @@ a
first
select QUERY, length(TRACE), INSUFFICIENT_PRIVILEGES from information_schema.OPTIMIZER_TRACE;
QUERY length(TRACE) INSUFFICIENT_PRIVILEGES
-select a from (select a from t1 where a like "f%") as tt where a like "fi%" 7334 0
+select a from (select a from t1 where a like "f%") as tt where a like "fi%" 7328 0
# For routines, as they only use t1 and we added only one
# privilege on t1, we have nothing to remove.
=== modified file 'mysql-test/suite/opt_trace/r/security_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/security_ps_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/security_ps_prot.result 2011-11-18 14:51:40 +0000
@@ -935,7 +935,7 @@ select QUERY, length(TRACE), INSUFFICIEN
QUERY length(TRACE) INSUFFICIENT_PRIVILEGES
insert into t2 values(current_user()) 20 0
insert into t2 values(current_user()) 20 0
-insert into t3 select * from t3 2688 0
+insert into t3 select * from t3 2682 0
# Trace exposed body of trigger, and content of t2/t3, which we
# could see anyway:
show create trigger trg2;
@@ -955,7 +955,7 @@ first
select QUERY, length(TRACE), INSUFFICIENT_PRIVILEGES from information_schema.OPTIMIZER_TRACE;
QUERY length(TRACE) INSUFFICIENT_PRIVILEGES
select a from (select a from t1 where a like "f%") as tt where a like "fi%" 613 0
-select a from (select a from t1 where a like "f%") as tt where a like "fi%" 7334 0
+select a from (select a from t1 where a like "f%") as tt where a like "fi%" 7328 0
# For routines, as they only use t1 and we added only one
# privilege on t1, we have nothing to remove.
=== modified file 'mysql-test/suite/opt_trace/r/subquery_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-11-18 14:51:40 +0000
@@ -1721,7 +1721,7 @@ field4,field5,field6 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "alias2",
"row_length": 46,
@@ -1729,12 +1729,12 @@ field4,field5,field6 {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 22795
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 13,
@@ -1742,7 +1742,7 @@ field4,field5,field6 {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 80659
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/subquery_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-11-18 14:51:40 +0000
@@ -1699,7 +1699,7 @@ field4,field5,field6 {
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "alias2",
"row_length": 46,
@@ -1707,12 +1707,12 @@ field4,field5,field6 {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 22795
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 13,
@@ -1720,7 +1720,7 @@ field4,field5,field6 {
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 80659
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
=== modified file 'mysql-test/suite/opt_trace/r/temp_table.result'
--- a/mysql-test/suite/opt_trace/r/temp_table.result 2011-11-18 12:17:45 +0000
+++ b/mysql-test/suite/opt_trace/r/temp_table.result 2011-11-18 14:51:40 +0000
@@ -127,7 +127,7 @@ SELECT uniq, col1 FROM t1 GROUP BY col2,
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 1054,
@@ -135,7 +135,7 @@ SELECT uniq, col1 FROM t1 GROUP BY col2,
"unique_constraint": true,
"location": "disk (MyISAM)",
"record_format": "fixed"
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -296,7 +296,7 @@ SELECT uniq, col1, col2 FROM t1 GROUP BY
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 1050,
@@ -304,7 +304,7 @@ SELECT uniq, col1, col2 FROM t1 GROUP BY
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 998
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
@@ -470,7 +470,7 @@ SELECT uniq, col1, col2 FROM t1 GROUP BY
"steps": [
{
"creating_tmp_table": {
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 1050,
@@ -478,13 +478,13 @@ SELECT uniq, col1, col2 FROM t1 GROUP BY
"unique_constraint": false,
"location": "memory (heap)",
"row_limit_estimate": 1
- } /* temporary_table_info */
+ } /* tmp_table_info */
} /* creating_tmp_table */
},
{
- "converting_temp_table_to_myisam": {
+ "converting_tmp_table_to_myisam": {
"cause": "memory_table_size_exceeded",
- "temporary_table_info": {
+ "tmp_table_info": {
"database": "",
"table": "intermediate_tmp_table",
"row_length": 1050,
@@ -492,8 +492,8 @@ SELECT uniq, col1, col2 FROM t1 GROUP BY
"unique_constraint": false,
"location": "disk (MyISAM)",
"record_format": "fixed"
- } /* temporary_table_info */
- } /* converting_temp_table_to_myisam */
+ } /* tmp_table_info */
+ } /* converting_tmp_table_to_myisam */
},
{
"filesort_information": [
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2011-11-18 12:17:45 +0000
+++ b/sql/sql_select.cc 2011-11-18 14:51:40 +0000
@@ -18660,7 +18660,7 @@ bool create_myisam_tmp_table(TABLE *tabl
void trace_tmp_table(Opt_trace_context *trace, const TABLE *table)
{
- Opt_trace_object trace_tmp(trace, "temporary_table_info");
+ Opt_trace_object trace_tmp(trace, "tmp_table_info");
trace_tmp.add_utf8_table(table);
trace_tmp.add("row_length",table->s->reclength).
@@ -18855,7 +18855,7 @@ bool create_myisam_from_heap(THD *thd, T
{
Opt_trace_context * trace= &thd->opt_trace;
Opt_trace_object wrapper(trace);
- Opt_trace_object convert(trace, "converting_temp_table_to_myisam");
+ Opt_trace_object convert(trace, "converting_tmp_table_to_myisam");
DBUG_ASSERT(error == HA_ERR_RECORD_FILE_FULL);
convert.add_alnum("cause", "memory_table_size_exceeded");
trace_tmp_table(trace, &new_table);
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-trunk branch (jorgen.loland:3626 to 3627) Bug#13400713 | Jorgen Loland | 21 Nov |
