← 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_partition_admin.cc

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_partition_admin.cc
141
141
    TODO: Add support for TRUNCATE PARTITION for NDB and other
142
142
          engines supporting native partitioning.
143
143
  */
144
 
  if (first_table->table->s->db_type() != partition_hton)
 
144
 
 
145
  if (!first_table->table || first_table->view ||
 
146
      first_table->table->s->db_type() != partition_hton)
145
147
  {
146
148
    my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
147
149
    DBUG_RETURN(TRUE);