summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2004-02-20 17:43:02 +0200
committermonty@mashka.mysql.fi <>2004-02-20 17:43:02 +0200
commit494e43c1f56d2a65fc804af865ae82661fbb046f (patch)
treee13a23a1c9f28ed5eb2d903ba59a153cda3355ac /sql/unireg.cc
parentf8b4732a5edccdf71eb65093c8bb6ec028176fec (diff)
parente1fee022fa10fc0cceafbd774441d70311e10434 (diff)
downloadmariadb-git-494e43c1f56d2a65fc804af865ae82661fbb046f.tar.gz
merge with 4.0 to get security fixes and latest bug fixes
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 357ba016fcb..6f127b57f64 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -151,7 +151,9 @@ int rea_create_table(THD *thd, my_string file_name,
my_free((gptr) screen_buff,MYF(0));
my_free((gptr) keybuff, MYF(0));
- if (opt_sync_frm && my_sync(file, MYF(MY_WME)))
+
+ if (opt_sync_frm && !(create_info->options & HA_LEX_CREATE_TMP_TABLE) &&
+ my_sync(file, MYF(MY_WME)))
goto err2;
if (my_close(file,MYF(MY_WME)) ||
ha_create_table(file_name,create_info,0))