diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /sql/handler.cc | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 38a9fff9921..9fca0a5d133 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -527,6 +527,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 || |