diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-17 12:12:33 +0200 |
| commit | 0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb (patch) | |
| tree | 7e682617fcbdab399d2eafccb6a4800dfdc71e51 /sql/sql_prepare.cc | |
| parent | 97ae1682f185be05276b172919e47fd86e9fd953 (diff) | |
| parent | df905524b218de07dddf5fa394af96edcc4ca483 (diff) | |
| download | mariadb-git-0a8c9b98f60bb1a21c7e67a1bb47166f0acfeddb.tar.gz | |
merge with mysql-5.1.63
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 1c0ee55b79d..6aa119f7d71 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -796,7 +796,7 @@ static bool insert_params_with_log(Prepared_statement *stmt, uchar *null_array, */ else if (! is_param_long_data_type(param)) DBUG_RETURN(1); - res= param->query_val_str(&str); + res= param->query_val_str(thd, &str); if (param->convert_str_value(thd)) DBUG_RETURN(1); /* out of memory */ @@ -970,7 +970,7 @@ static bool emb_insert_params_with_log(Prepared_statement *stmt, DBUG_RETURN(1); } } - res= param->query_val_str(&str); + res= param->query_val_str(thd, &str); if (param->convert_str_value(thd)) DBUG_RETURN(1); /* out of memory */ @@ -1116,7 +1116,7 @@ static bool insert_params_from_vars_with_log(Prepared_statement *stmt, setup_one_conversion_function(thd, param, param->param_type); if (param->set_from_user_var(thd, entry)) DBUG_RETURN(1); - val= param->query_val_str(&buf); + val= param->query_val_str(thd, &buf); if (param->convert_str_value(thd)) DBUG_RETURN(1); /* out of memory */ |