← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to sql/sql_prepare.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_prepare.cc
885
885
    */
886
886
    else if (! is_param_long_data_type(param))
887
887
      DBUG_RETURN(1);
888
 
    res= param->query_val_str(&str);
 
888
    res= param->query_val_str(thd, &str);
889
889
    if (param->convert_str_value(thd))
890
890
      DBUG_RETURN(1);                           /* out of memory */
891
891
 
1059
1059
          DBUG_RETURN(1);
1060
1060
      }
1061
1061
    }
1062
 
    res= param->query_val_str(&str);
 
1062
    res= param->query_val_str(thd, &str);
1063
1063
    if (param->convert_str_value(thd))
1064
1064
      DBUG_RETURN(1);                           /* out of memory */
1065
1065
 
1205
1205
    setup_one_conversion_function(thd, param, param->param_type);
1206
1206
    if (param->set_from_user_var(thd, entry))
1207
1207
      DBUG_RETURN(1);
1208
 
    val= param->query_val_str(&buf);
 
1208
    val= param->query_val_str(thd, &buf);
1209
1209
 
1210
1210
    if (param->convert_str_value(thd))
1211
1211
      DBUG_RETURN(1);                           /* out of memory */
2422
2422
      DBUG_ASSERT(sl->join == 0);
2423
2423
      ORDER *order;
2424
2424
      /* Fix GROUP list */
 
2425
      if (sl->group_list_ptrs && sl->group_list_ptrs->size() > 0)
 
2426
      {
 
2427
        for (uint ix= 0; ix < sl->group_list_ptrs->size() - 1; ++ix)
 
2428
        {
 
2429
          order= sl->group_list_ptrs->at(ix);
 
2430
          order->next= sl->group_list_ptrs->at(ix+1);
 
2431
        }
 
2432
      }
2425
2433
      for (order= sl->group_list.first; order; order= order->next)
2426
2434
        order->item= &order->item_ptr;
2427
2435
      /* Fix ORDER list */