database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-05-20 02:07:21 +02:00
parent 6f530c63cd 91dfb6141f
commit ff1d10ef9c
36 changed files with 353 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -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;
}