Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mysql-test/include/opt_ctx_cmp_2_runs_of_query.inc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ eval drop table $table_name;
-- source "$MYSQLTEST_VARDIR/tmp/dump1.sql"
-- enable_query_log

set optimizer_replay_context= 'opt_context';
let $explain_output=`$explain_query`;
evalp set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,5 +159,11 @@ set optimizer_replay_context='opt_context';
select count(*) from t1;
count(*)
0
drop table t1;
set optimizer_replay_context='';
create table t2( a int);
#
# MDEV-39222: Errors shown when inserting data into a new table
#
insert into t2 select seq from seq_1_to_10;
drop table t1, t2;
drop database db1;
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ drop table t1;

--source "$MYSQLTEST_VARDIR/tmp/dump1.sql"

create table t2( a int);
--echo #
--echo # MDEV-39222: Errors shown when inserting data into a new table
--echo #
insert into t2 select seq from seq_1_to_10;

--remove_file "$MYSQLTEST_VARDIR/tmp/dump1.sql"

drop table t1;
drop table t1, t2;
drop database db1;
14 changes: 14 additions & 0 deletions mysql-test/main/opt_ctx_replay_innodb_complement.result
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -265,6 +266,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -379,6 +381,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -499,6 +502,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -629,6 +633,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -743,6 +748,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -848,6 +854,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -932,6 +939,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1005,6 +1013,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1095,6 +1104,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1179,6 +1189,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1258,6 +1269,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1384,6 +1396,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1518,6 +1531,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down
14 changes: 14 additions & 0 deletions mysql-test/main/opt_ctx_replay_innodb_preferably.result
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -265,6 +266,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -379,6 +381,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -499,6 +502,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -629,6 +633,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -743,6 +748,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -848,6 +854,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -932,6 +939,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1005,6 +1013,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1095,6 +1104,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1179,6 +1189,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1258,6 +1269,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1384,6 +1396,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down Expand Up @@ -1518,6 +1531,7 @@ EXPLAIN
]
}
}
set optimizer_replay_context= 'opt_context';
set @explain_output= '$explain_output';
set @explain_output= (select json_pretty(round_cost(@explain_output)));
select JSON_EQUALS(@saved_explain_output, @explain_output);
Expand Down
1 change: 1 addition & 0 deletions sql/opt_context_store_replay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ bool store_optimizer_context(THD *thd)
sql_script.append(STRING_WITH_LEN(";\n\n"));
sql_script.append(thd->query(), thd->query_length());
sql_script.append(STRING_WITH_LEN(";\n\n"));
sql_script.append(STRING_WITH_LEN("set optimizer_replay_context='';\n\n"));
thd->captured_opt_ctx= new Optimizer_context_capture(thd, sql_script);
if (!thd->captured_opt_ctx)
return true; // OOM
Expand Down
Loading