summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-08-28 22:16:13 +0200
committerSergei Golubchik <sergii@pisem.net>2013-08-28 22:16:13 +0200
commit28a9fea122e40bdb9f199f053cc70299656b7018 (patch)
tree9d4c4e5a7dd0a35b1433375cd69c89c584c25f54 /sql/handler.cc
parent68325b6a12dbe8fc2e95ba69b4537e1d4d52e204 (diff)
downloadmariadb-git-28a9fea122e40bdb9f199f053cc70299656b7018.tar.gz
fix an old bug where dd_frm_type() could incorrectly determine the table type
for dynamic engines (because it only looked at the one-byte code, not at the full engine name).
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 7e4087ca77f..5dd816fa1e5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -486,6 +486,12 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
{
uint tmp;
ulong fslot;
+
+ DBUG_EXECUTE_IF("unstable_db_type", {
+ static int i= (int) DB_TYPE_FIRST_DYNAMIC;
+ hton->db_type= (enum legacy_db_type)++i;
+ });
+
/* now check the db_type for conflict */
if (hton->db_type <= DB_TYPE_UNKNOWN ||
hton->db_type >= DB_TYPE_DEFAULT ||