summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-03-26 16:49:11 +0300
committermonty@donna.mysql.fi <>2001-03-26 16:49:11 +0300
commitdab74107abc54ba9687b41f4ff2b3e3b45a07c10 (patch)
tree5da4abd6f52ae4b0af895f7c6248e92e8ccd2721 /sql/handler.cc
parent700dd225adaf4474b76ad8145473f2f2ef3d6376 (diff)
downloadmariadb-git-dab74107abc54ba9687b41f4ff2b3e3b45a07c10.tar.gz
Fix a crash in Innobase with tables with many columns and a range query
Removed all Attic directories.
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 600683d9c18..f057b75d498 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -151,6 +151,8 @@ int ha_init()
return error;
if (!berkeley_skip) // If we couldn't use handler
opt_using_transactions=1;
+ else
+ have_berkeley_db=SHOW_OPTION_DISABLED;
}
#endif
#ifdef HAVE_INNOBASE_DB
@@ -159,10 +161,9 @@ int ha_init()
if (innobase_init())
return -1;
if (!innobase_skip) // If we couldn't use handler
- {
opt_using_transactions=1;
+ else
have_innobase=SHOW_OPTION_DISABLED;
- }
}
#endif
#ifdef HAVE_GEMINI_DB
@@ -171,10 +172,9 @@ int ha_init()
if (gemini_init())
return -1;
if (!gemini_skip) // If we couldn't use handler
- {
opt_using_transactions=1;
+ else
have_gemini=SHOW_OPTION_DISABLED;
- }
}
#endif
return 0;