Skip to content

Commit 096286c

Browse files
committed
The method With_element::reset_for_exec was not called in non-debug
builds.
1 parent 0a6e6d7 commit 096286c

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,6 +2165,20 @@ NUMERIC_BLOCK_SIZE 1
21652165
ENUM_VALUE_LIST NULL
21662166
READ_ONLY NO
21672167
COMMAND_LINE_ARGUMENT REQUIRED
2168+
VARIABLE_NAME MAX_RECURSION_LEVEL
2169+
SESSION_VALUE 4294967295
2170+
GLOBAL_VALUE 4294967295
2171+
GLOBAL_VALUE_ORIGIN COMPILE-TIME
2172+
DEFAULT_VALUE 4294967295
2173+
VARIABLE_SCOPE SESSION
2174+
VARIABLE_TYPE BIGINT UNSIGNED
2175+
VARIABLE_COMMENT Maximum number of iterations when executing recursive queries
2176+
NUMERIC_MIN_VALUE 0
2177+
NUMERIC_MAX_VALUE 4294967295
2178+
NUMERIC_BLOCK_SIZE 1
2179+
ENUM_VALUE_LIST NULL
2180+
READ_ONLY NO
2181+
COMMAND_LINE_ARGUMENT OPTIONAL
21682182
VARIABLE_NAME MAX_RELAY_LOG_SIZE
21692183
SESSION_VALUE 1073741824
21702184
GLOBAL_VALUE 1073741824
@@ -4419,6 +4433,20 @@ NUMERIC_BLOCK_SIZE NULL
44194433
ENUM_VALUE_LIST NULL
44204434
READ_ONLY YES
44214435
COMMAND_LINE_ARGUMENT REQUIRED
4436+
VARIABLE_NAME STANDARDS_COMPLIANT_CTE
4437+
SESSION_VALUE ON
4438+
GLOBAL_VALUE ON
4439+
GLOBAL_VALUE_ORIGIN COMPILE-TIME
4440+
DEFAULT_VALUE ON
4441+
VARIABLE_SCOPE SESSION
4442+
VARIABLE_TYPE BOOLEAN
4443+
VARIABLE_COMMENT Allow only standards compiant CTE
4444+
NUMERIC_MIN_VALUE NULL
4445+
NUMERIC_MAX_VALUE NULL
4446+
NUMERIC_BLOCK_SIZE NULL
4447+
ENUM_VALUE_LIST OFF,ON
4448+
READ_ONLY NO
4449+
COMMAND_LINE_ARGUMENT OPTIONAL
44224450
VARIABLE_NAME STORAGE_ENGINE
44234451
SESSION_VALUE MyISAM
44244452
GLOBAL_VALUE MyISAM

sql/sql_union.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,10 +1349,10 @@ void st_select_lex_unit::reinit_exec_mechanism()
13491349
*/
13501350
field->fixed= 0;
13511351
}
1352-
if (with_element && with_element->is_recursive)
1353-
with_element->reset_for_exec();
13541352
}
13551353
#endif
1354+
if (with_element && with_element->is_recursive)
1355+
with_element->reset_for_exec();
13561356
}
13571357

13581358

0 commit comments

Comments
 (0)