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_class.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_class.cc')
-rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 87fe68ed967..23eda5ead77 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3603,7 +3603,7 @@ void Statement::set_statement(Statement *stmt) { id= stmt->id; mark_used_columns= stmt->mark_used_columns; - stmt_lex= lex= stmt->lex; + lex= stmt->lex; query_string= stmt->query_string; } |