diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-20 11:29:01 +0200 |
| commit | 2fe0836eed16ce5809c34064893681f12c77da9f (patch) | |
| tree | 441c1eb870dadd4659e6b63e9fd48aecbafbdb7f /sql | |
| parent | 4232874772c7fb041247614790f1b22740ddfb7f (diff) | |
| parent | 28ec372744e6dbeab9ecae7a3a9a7ef23b0866d5 (diff) | |
| download | mariadb-git-2fe0836eed16ce5809c34064893681f12c77da9f.tar.gz | |
5.5.33a merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index b81c9c2dcb6..7adf4f4831b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1135,7 +1135,10 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, if (se_plugin) { /* bad file, legacy_db_type did not match the name */ - goto err; + sql_print_warning("%s.frm is inconsistent: engine typecode %d, engine name %s (%d)", + share->normalized_path.str, legacy_db_type, + plugin_name(tmp_plugin)->str, + ha_legacy_type(plugin_data(tmp_plugin, handlerton *))); } /* tmp_plugin is locked with a local lock. |