diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:06:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 10:06:39 +0300 |
| commit | cacb61b6be78b01a9c62890cc81d059ee46921ac (patch) | |
| tree | 7065a7417d5569d5a5f61104daf09f6a98e842bc /client/mysqltest.cc | |
| parent | aed87f1e0aa20e9e3f525ff303ee766ca6b106b7 (diff) | |
| parent | f089f8d95e569291bdf4329124c34674f02e40fe (diff) | |
| download | mariadb-git-cacb61b6be78b01a9c62890cc81d059ee46921ac.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index e855e1af807..beaa2846996 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -8587,7 +8587,10 @@ void run_prepare_stmt(struct st_connection *cn, struct st_command *command, cons separate string */ if (!disable_warnings) + { append_warnings(&ds_prepare_warnings, mysql); + dynstr_free(&ds_prepare_warnings); + } end: DBUG_VOID_RETURN; } @@ -8666,7 +8669,7 @@ void run_bind_stmt(struct st_connection *cn, struct st_command *command, else { ps_params[i].buffer_type= MYSQL_TYPE_STRING; - ps_params[i].buffer= strdup(p); + ps_params[i].buffer= my_strdup(PSI_NOT_INSTRUMENTED, p, MYF(MY_WME)); ps_params[i].buffer_length= (unsigned long)strlen(p); } } |