database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

5.5 merge and fixes for compiler/test errors

Browse Source
This commit is contained in:
Sergei Golubchik
2013-09-18 13:07:31 +02:00
parent 1a2a9d74fe 197bdbae4d
commit 4ec2e9d7ed
3617 changed files with 1904339 additions and 85313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.cc
View File

@@ -528,6 +528,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 ||