diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
| commit | 2d8e38bc9477aa00b371ed14d95390bede70c5cb (patch) | |
| tree | 7d4e4e22138572b769263994697d69bd141c5bf3 /client/mysqltest.cc | |
| parent | b249abde57f1788a8085f45cc6252ee70ece3354 (diff) | |
| parent | 4e1ca388381eea27a9275571744ad17ce317b273 (diff) | |
| download | mariadb-git-2d8e38bc9477aa00b371ed14d95390bede70c5cb.tar.gz | |
Merge 10.6 into 10.7
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 99d27751db2..56359ca6c07 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -8612,7 +8612,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; } @@ -8691,7 +8694,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); } } |