Commit dcf8e0fe authored by unknown's avatar unknown
Browse files

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455 

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
parents ed55bc9e 0f5df8e1

mysql-test/r/partition.result

+10 −0
Original line number Diff line number Diff line
@@ -926,4 +926,14 @@ CREATE TABLE t1 (a int, index(a)) PARTITION BY KEY(a); 
ALTER TABLE t1 DISABLE KEYS;

ALTER TABLE t1 ENABLE KEYS;

DROP TABLE t1;

create table t1 (a int)

engine=MEMORY

partition by key (a);

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	note	The storage engine for the table doesn't support repair

OPTIMIZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	note	The storage engine for the table doesn't support optimize

drop table t1;

End of 5.1 tests

sql/ha_partition.cc

+2 −4
Original line number Diff line number Diff line
@@ -1108,8 +1108,7 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt, 
                     part));

          if ((error= handle_opt_part(thd, check_opt, m_file[part], flag)))

          {

            my_error(ER_GET_ERRNO, MYF(0), error);

            DBUG_RETURN(TRUE);

            DBUG_RETURN(error);

          }

        } while (++j < no_subparts);

      }
@@ -1118,8 +1117,7 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt, 
        DBUG_PRINT("info", ("Optimize partition %u", i));

        if ((error= handle_opt_part(thd, check_opt, m_file[i], flag)))

        {

          my_error(ER_GET_ERRNO, MYF(0), error);

          DBUG_RETURN(TRUE);

          DBUG_RETURN(error);

        }

      }

    }