diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
| commit | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (patch) | |
| tree | b7447115f45de0f03bbe18c26fc0866367483066 /sql/sql_select.h | |
| parent | db9e41ddc31f2e705a54132cf69c781e1cc60f07 (diff) | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| download | mariadb-git-780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 0c226e54706..2fafdd74ad9 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -882,7 +882,7 @@ public: void set_empty() { sjm_scan_need_tables= 0; - LINT_INIT_STRUCT(sjm_scan_last_inner); + sjm_scan_last_inner= 0; is_used= FALSE; } void set_from_prev(struct st_position *prev); |