diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
| commit | a0238152c7cc44b24d7ceb17755a5e24bd8b511a (patch) | |
| tree | ffb1240e5cdf7d9be7936eb35ef77d4645b6297f /sql/sql_prepare.cc | |
| parent | be866add0622db4258a0659c1e01ea7ae2fb5445 (diff) | |
| parent | 9af695fb4587a6e53241d05635caaaa113ac95d8 (diff) | |
| download | mariadb-git-a0238152c7cc44b24d7ceb17755a5e24bd8b511a.tar.gz | |
Merge from 5.1 to 5.5
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 76026f52b14..8390594c2eb 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -885,7 +885,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 */ @@ -1059,7 +1059,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 */ @@ -1205,7 +1205,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 */ |