diff options
| author | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
| commit | ce145789092b294a562f565671478ae2bf51d14a (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /sql/unireg.cc | |
| parent | 0c6a0b9a3118948efeedefd036d2994982babd08 (diff) | |
| parent | efb134f3a874befe4ab1779f597ada09f57ca191 (diff) | |
| download | mariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz | |
Merge with 4.0.18
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 6ebba313442..357ba016fcb 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -29,6 +29,7 @@ #include <m_ctype.h> #define FCOMP 17 /* Bytes for a packed field */ +#define FCOMP 17 /* Bytes for a packed field */ static uchar * pack_screens(List<create_field> &create_fields, uint *info_length, uint *screens, bool small_file); @@ -150,7 +151,7 @@ int rea_create_table(THD *thd, my_string file_name, my_free((gptr) screen_buff,MYF(0)); my_free((gptr) keybuff, MYF(0)); - if (my_sync(file, MYF(MY_WME))) + if (opt_sync_frm && my_sync(file, MYF(MY_WME))) goto err2; if (my_close(file,MYF(MY_WME)) || ha_create_table(file_name,create_info,0)) |