summaryrefslogtreecommitdiff
path: root/sql/init.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-08-12 13:54:42 +0300
committermonty@mysql.com <>2005-08-12 13:54:42 +0300
commit4c0d23e156d1148243ae8439c1115280e78ad04c (patch)
tree70e0735a5a37bab3dae8e75c038e4c86703fc643 /sql/init.cc
parente80252e53cfd040dc09e6160d4c2d8ed9c1bbe54 (diff)
downloadmariadb-git-4c0d23e156d1148243ae8439c1115280e78ad04c.tar.gz
Fixes during review of new pushed code
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
Diffstat (limited to 'sql/init.cc')
-rw-r--r--sql/init.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/init.cc b/sql/init.cc
index 4beb8db0c6f..e53eeab8902 100644
--- a/sql/init.cc
+++ b/sql/init.cc
@@ -39,12 +39,11 @@ void unireg_init(ulong options)
#endif
VOID(strmov(reg_ext,".frm"));
- specialflag=SPECIAL_SAME_DB_NAME;
+ specialflag=SPECIAL_SAME_DB_NAME | options; /* Set options from argv */
/* Make a tab of powers of 10 */
for (i=0,nr=1.0; i < array_elements(log_10) ; i++)
{ /* It's used by filesort... */
log_10[i]= nr ; nr*= 10.0;
}
- specialflag|=options; /* Set options from argv */
DBUG_VOID_RETURN;
}