diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-08-26 19:43:32 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-08-26 19:43:32 +0400 |
| commit | 09d01ba615c267fb2297c6a34b90835bffda3c23 (patch) | |
| tree | 71cc81b2e9dde264372bad3721f4897fe688fe6b /sql/table.cc | |
| parent | 24ebb184ca3f9a472d1244edd2170e7ba2babb1b (diff) | |
| parent | fc3945950452a12ea7e47c685a73d5d22d338ec2 (diff) | |
| download | mariadb-git-09d01ba615c267fb2297c6a34b90835bffda3c23.tar.gz | |
Merge from mysql-5.1-bugteam
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 61d37a16ef4..4442243ec14 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -913,6 +913,15 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, we unlock the old value of share->db_plugin before replacing it with a globally locked version of tmp_plugin */ + /* Check if the partitioning engine is ready */ + if (!plugin_is_ready(&name, MYSQL_STORAGE_ENGINE_PLUGIN)) + { + error= 8; + my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), + "--skip-partition"); + my_free(buff, MYF(0)); + goto err; + } plugin_unlock(NULL, share->db_plugin); share->db_plugin= ha_lock_engine(NULL, partition_hton); DBUG_PRINT("info", ("setting dbtype to '%.*s' (%d)", |