diff options
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 98e796879ad..a753c5052bd 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -226,11 +226,6 @@ bool partition_info::set_partition_bitmaps(TABLE_LIST *table_list) { if (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) { - /* - Don't allow PARTITION () clause on a NDB tables yet. - TODO: Add partition name handling to NDB/partition_info. - which is currently ha_partition specific. - */ my_error(ER_PARTITION_CLAUSE_ON_NONPARTITIONED, MYF(0)); DBUG_RETURN(true); } @@ -286,7 +281,7 @@ bool partition_info::can_prune_insert(THD* thd, DBUG_ENTER("partition_info::can_prune_insert"); if (table->s->db_type()->partition_flags() & HA_USE_AUTO_PARTITION) - DBUG_RETURN(false); /* Should not insert prune NDB tables */ + DBUG_RETURN(false); /* If under LOCK TABLES pruning will skip start_stmt instead of external_lock @@ -1110,14 +1105,12 @@ static bool check_engine_condition(partition_element *p_elem, Current check verifies only that all handlers are the same. Later this check will be more sophisticated. (specified partition handler ) specified table handler - (NDB, NDB) NDB OK (MYISAM, MYISAM) - OK (MYISAM, -) - NOT OK (MYISAM, -) MYISAM OK (- , MYISAM) - NOT OK (- , -) MYISAM OK (-,-) - OK - (NDB, MYISAM) * NOT OK */ bool partition_info::check_engine_mix(handlerton *engine_type, |