database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-11-30 08:16:37 +02:00
parent 51b30586ea 5b697c5a23
commit 7cb3520c06
2034 changed files with 179230 additions and 109759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_get_diagnostics.cc
View File

@@ -110,6 +110,9 @@ Diagnostics_information_item::set_value(THD *thd, Item **value)
DBUG_ASSERT(srp);
/* GET DIAGNOSTICS is not allowed in prepared statements */
DBUG_ASSERT(srp->get_item_param() == NULL);
/* Set variable/parameter value. */
rv= srp->set_value(thd, thd->spcont, value);