← 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_show.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_show.cc
952
952
{
953
953
  const char *name_end;
954
954
  char quote_char;
955
 
  int q= get_quote_char_for_identifier(thd, name, length);
 
955
  int q;
 
956
  q= thd ? get_quote_char_for_identifier(thd, name, length) : '`';
956
957
 
957
958
  if (q == EOF)
958
959
  {
3155
3156
  /* Restore original LEX value, statement's arena and THD arena values. */
3156
3157
  lex_end(thd->lex);
3157
3158
 
3158
 
  if (i_s_arena.free_list)
3159
 
    i_s_arena.free_items();
 
3159
  // Free items, before restoring backup_arena below.
 
3160
  DBUG_ASSERT(i_s_arena.free_list == NULL);
 
3161
  thd->free_items();
3160
3162
 
3161
3163
  /*
3162
3164
    For safety reset list of open temporary tables before closing
4923
4925
  {
4924
4926
    DBUG_RETURN(1);
4925
4927
  }
4926
 
  proc_table->file->ha_index_init(0, 1);
 
4928
 
 
4929
  if (proc_table->file->ha_index_init(0, 1))
 
4930
  {
 
4931
    res= 1;
 
4932
    goto err;
 
4933
  }
 
4934
 
4927
4935
  if ((res= proc_table->file->index_first(proc_table->record[0])))
4928
4936
  {
4929
4937
    res= (res == HA_ERR_END_OF_FILE) ? 0 : 1;
4949
4957
  }
4950
4958
 
4951
4959
err:
4952
 
  proc_table->file->ha_index_end();
 
4960
  if (proc_table->file->inited)
 
4961
    (void) proc_table->file->ha_index_end();
 
4962
 
4953
4963
  close_system_tables(thd, &open_tables_state_backup);
4954
4964
  DBUG_RETURN(res);
4955
4965
}