Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2397 06/05/15 13:38:35 knielsen@stripped +3 -0
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug19633
into mysql.com:/usr/local/mysql/tmp-5.1
sql/sp_head.cc
1.219 06/05/15 13:38:31 knielsen@stripped +0 -0
SCCS merged
sql/sql_class.cc
1.258 06/05/15 13:35:22 knielsen@stripped +0 -0
Auto merged
sql/sp_head.h
1.87 06/05/15 13:35:22 knielsen@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: knielsen
# Host: rt.int.sifira.dk
# Root: /usr/local/mysql/tmp-5.1/RESYNC
--- 1.257/sql/sql_class.cc 2006-05-05 19:08:37 +02:00
+++ 1.258/sql/sql_class.cc 2006-05-15 13:35:22 +02:00
@@ -1925,7 +1925,7 @@
if ((yy=var_li++))
{
if (thd->spcont->set_variable(current_thd, yy->get_var_idx(),
- *it.ref()))
+ it.ref()))
DBUG_RETURN(1);
}
}
--- 1.218/sql/sp_head.cc 2006-05-04 14:34:26 +02:00
+++ 1.219/sql/sp_head.cc 2006-05-15 13:38:31 +02:00
@@ -315,14 +315,16 @@
*/
bool
-sp_eval_expr(THD *thd, Field *result_field, Item *expr_item)
+sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr)
{
+ Item *expr_item;
+
DBUG_ENTER("sp_eval_expr");
if (!expr_item)
DBUG_RETURN(TRUE);
- if (!(expr_item= sp_prepare_func_item(thd, &expr_item)))
+ if (!(expr_item= sp_prepare_func_item(thd, expr_item_ptr)))
DBUG_RETURN(TRUE);
bool err_status= FALSE;
@@ -1284,7 +1286,7 @@
param_values[i]= Item_cache::get_cache(argp[i]->result_type());
param_values[i]->store(argp[i]);
- if (nctx->set_variable(thd, i, param_values[i]))
+ if (nctx->set_variable(thd, i, (struct Item **)&(param_values[i])))
{
err_status= TRUE;
break;
@@ -1490,7 +1492,7 @@
Item_null *null_item= new Item_null();
if (!null_item ||
- nctx->set_variable(thd, i, null_item))
+ nctx->set_variable(thd, i, (struct Item **)&null_item))
{
err_status= TRUE;
break;
@@ -1498,7 +1500,7 @@
}
else
{
- if (nctx->set_variable(thd, i, *it_args.ref()))
+ if (nctx->set_variable(thd, i, it_args.ref()))
{
err_status= TRUE;
break;
@@ -1570,7 +1572,7 @@
{
if (octx->set_variable(thd,
((Item_splocal*) arg_item)->get_var_idx(),
- nctx->get_item(i)))
+ nctx->get_item_addr(i)))
{
err_status= TRUE;
break;
@@ -1582,15 +1584,15 @@
if (guv)
{
- Item *item= nctx->get_item(i);
+ Item **item= nctx->get_item_addr(i);
Item_func_set_user_var *suv;
- suv= new Item_func_set_user_var(guv->get_name(), item);
+ suv= new Item_func_set_user_var(guv->get_name(), *item);
/*
Item_func_set_user_var is not fixed after construction,
call fix_fields().
*/
- if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||
+ if ((err_status= test(!suv || suv->fix_fields(thd, item) ||
suv->check() || suv->update())))
break;
}
@@ -2372,7 +2374,7 @@
int
sp_instr_set::exec_core(THD *thd, uint *nextp)
{
- int res= thd->spcont->set_variable(thd, m_offset, m_value);
+ int res= thd->spcont->set_variable(thd, m_offset, &m_value);
if (res && thd->spcont->found_handler_here())
{
@@ -2647,7 +2649,7 @@
do it in scope of execution the current context/block.
*/
- return thd->spcont->set_return_value(thd, m_value);
+ return thd->spcont->set_return_value(thd, &m_value);
}
void
@@ -3091,7 +3093,7 @@
int
sp_instr_set_case_expr::exec_core(THD *thd, uint *nextp)
{
- int res= thd->spcont->set_case_expr(thd, m_case_expr_id, m_case_expr);
+ int res= thd->spcont->set_case_expr(thd, m_case_expr_id, &m_case_expr);
if (res &&
!thd->spcont->get_case_expr(m_case_expr_id) &&
@@ -3105,7 +3107,7 @@
Item *null_item= new Item_null();
if (!null_item ||
- thd->spcont->set_case_expr(thd, m_case_expr_id, null_item))
+ thd->spcont->set_case_expr(thd, m_case_expr_id, &null_item))
{
/* If this also failed, we have to abort. */
--- 1.86/sql/sp_head.h 2006-05-04 14:34:26 +02:00
+++ 1.87/sql/sp_head.h 2006-05-15 13:35:22 +02:00
@@ -1170,6 +1170,6 @@
sp_prepare_func_item(THD* thd, Item **it_addr);
bool
-sp_eval_expr(THD *thd, Field *result_field, Item *expr_item);
+sp_eval_expr(THD *thd, Field *result_field, Item **expr_item_ptr);
#endif /* _SP_HEAD_H_ */
| Thread |
|---|
| • bk commit into 5.1 tree (knielsen:1.2397) | knielsen | 15 May |
