diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-21 18:11:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-11 18:53:06 +0200 |
| commit | 7f5e51b940d65cf541403a50af74163b9aed5cb8 (patch) | |
| tree | e540d3cd4d678cd276a9d496490ac5e527f30a78 /sql/partition_info.cc | |
| parent | 57dd1f6f3fcbc7a46e1b3e71257987315f7aa687 (diff) | |
| download | mariadb-git-7f5e51b940d65cf541403a50af74163b9aed5cb8.tar.gz | |
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
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, |