← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

Viewing changes to sql/sql_signal.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-01-16 10:11:37 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20130116101137-w2lant30o21mzi0b
Tags: 5.5.29-0ubuntu0.12.10.1
https://launchpad.net/bugs/1100264
* SECURITY UPDATE: Update to 5.5.29 to fix security issues (LP: #1100264)
  - http://www.oracle.com/technetwork/topics/security/cpujan2013-1515902.html
* debian/patches/CVE-2012-5611.patch: removed, included upstream.
* debian/patches/38_scripts__mysqld_safe.sh__signals.patch: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_signal.cc
478
478
 
479
479
bool Resignal_statement::execute(THD *thd)
480
480
{
481
 
  MYSQL_ERROR *signaled;
 
481
  Sql_condition_info *signaled;
482
482
  int result= TRUE;
483
483
 
484
484
  DBUG_ENTER("Resignal_statement::execute");
491
491
    DBUG_RETURN(result);
492
492
  }
493
493
 
 
494
  MYSQL_ERROR signaled_err(thd->mem_root);
 
495
  signaled_err.set(signaled->m_sql_errno,
 
496
                   signaled->m_sql_state,
 
497
                   signaled->m_level,
 
498
                   signaled->m_message);
 
499
 
494
500
  if (m_cond == NULL)
495
501
  {
496
502
    /* RESIGNAL without signal_value */
497
 
    result= raise_condition(thd, signaled);
 
503
    result= raise_condition(thd, &signaled_err);
498
504
    DBUG_RETURN(result);
499
505
  }
500
506
 
501
507
  /* RESIGNAL with signal_value */
502
 
  result= raise_condition(thd, signaled);
 
508
  result= raise_condition(thd, &signaled_err);
503
509
 
504
510
  DBUG_RETURN(result);
505
511
}