← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

Viewing changes to sql/sql_select.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_select.cc
2691
2691
    table_vector[i]=s->table=table=tables->table;
2692
2692
    table->pos_in_table_list= tables;
2693
2693
    error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
 
2694
 
 
2695
    DBUG_EXECUTE_IF("bug11747970_raise_error",
 
2696
                    {
 
2697
                      if (!error)
 
2698
                      {
 
2699
                        my_error(ER_UNKNOWN_ERROR, MYF(0));
 
2700
                        goto error;
 
2701
                      }
 
2702
                    });
 
2703
 
2694
2704
    if (error)
2695
2705
    {
2696
2706
      table->file->print_error(error, MYF(0));
10884
10894
  if (open_tmp_table(table))
10885
10895
    goto err;
10886
10896
 
 
10897
  // Make empty record so random data is not written to disk
 
10898
  empty_record(table);
 
10899
 
10887
10900
  thd->mem_root= mem_root_save;
10888
10901
 
10889
10902
  DBUG_RETURN(table);