diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 02:07:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 20:25:35 +0200 |
| commit | ff1d10ef9c8595136cc7687aa59e638cf31db332 (patch) | |
| tree | 1aeb1d16ce75cb40a56d34789f0b2c083e4aa8f6 /sql/sql_prepare.cc | |
| parent | 6f530c63cd90a86e3acb5e5e6bf81c6d666025eb (diff) | |
| parent | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (diff) | |
| download | mariadb-git-ff1d10ef9c8595136cc7687aa59e638cf31db332.tar.gz | |
Merge branch '10.1' into 10.2
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 8a95719069c..d209707fbd7 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3921,7 +3921,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); |