database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

The method With_element::reset_for_exec was not called in non-debug

Browse Source 
builds.
This commit is contained in:
Igor Babaev
2016-06-07 11:06:54 -07:00
parent 0a6e6d705b
commit 096286c95f
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
View File

@ -2165,6 +2165,20 @@ NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME MAX_RECURSION_LEVEL
SESSION_VALUE 4294967295
GLOBAL_VALUE 4294967295
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 4294967295
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Maximum number of iterations when executing recursive queries
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 4294967295
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME MAX_RELAY_LOG_SIZE VARIABLE_NAME MAX_RELAY_LOG_SIZE
SESSION_VALUE 1073741824 SESSION_VALUE 1073741824
GLOBAL_VALUE 1073741824 GLOBAL_VALUE 1073741824
@ -4419,6 +4433,20 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY YES READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME STANDARDS_COMPLIANT_CTE
SESSION_VALUE ON
GLOBAL_VALUE ON
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE ON
VARIABLE_SCOPE SESSION
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Allow only standards compiant CTE
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST OFF,ON
READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME STORAGE_ENGINE VARIABLE_NAME STORAGE_ENGINE
SESSION_VALUE MyISAM SESSION_VALUE MyISAM
GLOBAL_VALUE MyISAM GLOBAL_VALUE MyISAM

4
sql/sql_union.cc
View File

@ -1349,10 +1349,10 @@ void st_select_lex_unit::reinit_exec_mechanism()
*/ */
field->fixed= 0; field->fixed= 0;
} }
if (with_element && with_element->is_recursive)
with_element->reset_for_exec();
} }
#endif #endif
if (with_element && with_element->is_recursive)
with_element->reset_for_exec();
} }