← Back to branch summary

~ubuntu-branches/ubuntu/raring/mysql-5.5/raring-proposed

« back to all changes in this revision

Viewing changes to sql/sql_table.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_table.cc
4555
4555
    goto err;
4556
4556
  src_table->table->use_all_columns();
4557
4557
 
 
4558
  DEBUG_SYNC(thd, "create_table_like_after_open");
 
4559
 
4558
4560
  /* Fill HA_CREATE_INFO and Alter_info with description of source table. */
4559
4561
  bzero((char*) &local_create_info, sizeof(local_create_info));
4560
4562
  local_create_info.db_type= src_table->table->s->db_type();
4603
4605
              thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db,
4604
4606
                                             table->table_name,
4605
4607
                                             MDL_EXCLUSIVE));
 
4608
 
 
4609
  DEBUG_SYNC(thd, "create_table_like_before_binlog");
 
4610
 
4606
4611
  /*
4607
4612
    We have to write the query before we unlock the tables.
4608
4613
  */
5958
5963
    case ENABLE:
5959
5964
      if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
5960
5965
        goto err;
 
5966
      DEBUG_SYNC(thd,"alter_table_enable_indexes");
5961
5967
      DBUG_EXECUTE_IF("sleep_alter_enable_indexes", my_sleep(6000000););
5962
5968
      error= table->file->ha_enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
5963
5969
      break;