diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-28 22:07:56 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-28 22:07:56 -0700 |
| commit | 8ce2e1bcbe1f00b6030b1c82ea62b3a64b1d0de9 (patch) | |
| tree | 19121a2348ffbbef01922ee03a64f787a31bda78 /sql/mysql_priv.h | |
| parent | 1e1755be86c4bd178584e99c5d7b831b5154c940 (diff) | |
| download | mariadb-git-8ce2e1bcbe1f00b6030b1c82ea62b3a64b1d0de9.tar.gz | |
Fixed the abort failure of a test case from vcol.vcol_misc.
The fix blocks execution of any constant sub-expressions of
the defining expressions for virtual columns when context
analysis if these expressions is performed.
Fixed a compiler warning.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 29b6aa88740..5f91e767c97 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -679,6 +679,12 @@ enabled by default, add OPTIMIZER_SWITCH_MATERIALIZATION #define CONTEXT_ANALYSIS_ONLY_DERIVED 4 /* + Don't evaluate constant sub-expressions of virtual column + expressions when opening tables +*/ +#define CONTEXT_ANALYSIS_ONLY_VCOL_EXPR 8 + +/* Uncachable causes: This subquery has fields from outer query (put by user) @@ -1095,7 +1101,7 @@ struct Query_cache_query_flags #define query_cache_resize(A) do { } while(0) #define query_cache_set_min_res_unit(A) do { } while(0) #define query_cache_invalidate3(A, B, C) do { } while(0) -#define query_cache_invalidate1(A) do { } while(0) +#define query_cache_invalidate1(A,B) do { } while(0) #define query_cache_send_result_to_client(A, B, C) 0 #define query_cache_invalidate_by_MyISAM_filename_ref NULL #define query_cache_abort(A) do { } while(0) |