diff options
| author | knielsen@mysql.com <> | 2006-05-15 19:57:10 +0200 |
|---|---|---|
| committer | knielsen@mysql.com <> | 2006-05-15 19:57:10 +0200 |
| commit | c8fd62f3b2c621610e01787b187485af9dbf70bf (patch) | |
| tree | 5c90e354587c8207f12674d3d36bc1b67a2d47a8 /sql/sp_head.cc | |
| parent | bec4d0a1fa6ed79361d85180c41cb688a2f8485d (diff) | |
| download | mariadb-git-c8fd62f3b2c621610e01787b187485af9dbf70bf.tar.gz | |
After-merge fixes; some function signatures changed from Item * to Item **.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d5c57eca76e..174f62c9497 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1552,7 +1552,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args) DBUG_ASSERT(srp); - if (srp->set_value(thd, octx, nctx->get_item(i))) + if (srp->set_value(thd, octx, nctx->get_item_addr(i))) { err_status= TRUE; break; @@ -2393,7 +2393,7 @@ sp_instr_set_trigger_field::execute(THD *thd, uint *nextp) int sp_instr_set_trigger_field::exec_core(THD *thd, uint *nextp) { - const int res= (trigger_field->set_value(thd, value) ? -1 : 0); + const int res= (trigger_field->set_value(thd, &value) ? -1 : 0); *nextp = m_ip+1; return res; } |