diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-30 08:16:37 +0200 |
| commit | 7cb3520c0632ad912b309489ad86a90f9fc9bd0b (patch) | |
| tree | ff8e6b8fdf5e9cacdfe914790e480bc3bad2ad85 /sql/sql_get_diagnostics.cc | |
| parent | 51b30586ea999744de6a15146257f2976825781e (diff) | |
| parent | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (diff) | |
| download | mariadb-git-7cb3520c0632ad912b309489ad86a90f9fc9bd0b.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_get_diagnostics.cc')
| -rw-r--r-- | sql/sql_get_diagnostics.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_get_diagnostics.cc b/sql/sql_get_diagnostics.cc index 76973b4daa2..e7ab6cc3c75 100644 --- a/sql/sql_get_diagnostics.cc +++ b/sql/sql_get_diagnostics.cc @@ -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); |