diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-05-07 17:42:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-05-07 19:14:02 +0200 |
| commit | 85e6bba1d6fb5cb2487c760d9e73812d4fb17f32 (patch) | |
| tree | 48b284a00ad5583ba8c121cdd355e07c862d4fbd /sql/sql_prepare.cc | |
| parent | 0db66ab18ffef6d8920e2e6ff66e99516a458a4d (diff) | |
| download | mariadb-git-bb-10.1-MDEV-15347.tar.gz | |
MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query from information_schemabb-10.1-MDEV-15347
Make each lex pointing to statement lex instead of global pointer in THD (no
need store and restoire the global pointer and put it on SP stack).
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6e14ddc2afb..d39ed6aa637 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3635,7 +3635,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) if (! (lex= new (mem_root) st_lex_local)) DBUG_RETURN(TRUE); - stmt_lex= lex; + lex->stmt_lex= lex; if (set_db(thd->db, thd->db_length)) DBUG_RETURN(TRUE); |