summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-06-15 16:02:43 +0200
committerSergei Golubchik <sergii@pisem.net>2013-06-15 16:02:43 +0200
commit10be9160c14f3bd488578ed64304a10d27b7b122 (patch)
tree19ce475db347619718db3834b30c35f1e966cfeb /storage
parent04aeaaa04fe4a39c878904e1a0d33b245b7e4541 (diff)
downloadmariadb-git-10be9160c14f3bd488578ed64304a10d27b7b122.tar.gz
MDEV-4466 Partitioned Aria table created by a previous version is recognized as TEST_SQL_DISCOVERY
Partitioning didn't store the name of default storage engine for partitions in the frm file - it only store the typecode. Typecodes aren't stable, and might vary depending on the order in which storage engines are loaded (can be changed even from my.cnf without recompilation). As a temporary workaround for 5.5, we hard-code Aria's typecode, to make sure it never changes.
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/ha_maria.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 6eccc14b51a..9a96dd3da44 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -3471,7 +3471,7 @@ static int ha_maria_init(void *p)
maria_hton= (handlerton *)p;
maria_hton->state= SHOW_OPTION_YES;
- maria_hton->db_type= DB_TYPE_UNKNOWN;
+ maria_hton->db_type= DB_TYPE_ARIA;
maria_hton->create= maria_create_handler;
maria_hton->panic= maria_hton_panic;
maria_hton->commit= maria_commit;