database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-03 17:01:31 +01:00
parent 8d742fe4ac cf63eecef4
commit f5c5f8e41e
878 changed files with 17965 additions and 5946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cursor.cc
View File

@ -197,7 +197,7 @@ int mysql_open_cursor(THD *thd, select_result *result,
}
*pcursor= materialized_cursor;
thd->stmt_arena->cleanup_stmt(true);
rc|= (thd->stmt_arena->cleanup_stmt(true)? 1 : 0);
}
end: