summaryrefslogtreecommitdiff
path: root/sql/discover.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:57:09 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:57:09 +0200
commite06cb31719ce31fb1cd7944d1de86d4de9e3eca6 (patch)
tree2c740b5851514787748799604b6c724d7c4e10b9 /sql/discover.cc
parentb3e70c4ae713abeddd47b3987f898ed763fa4eca (diff)
downloadmariadb-git-e06cb31719ce31fb1cd7944d1de86d4de9e3eca6.tar.gz
CREATE TABLE and frm-less discovering engines.
Now CREATE TABLE does not write the frm file on disk, if the engine can discover it
Diffstat (limited to 'sql/discover.cc')
-rw-r--r--sql/discover.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/discover.cc b/sql/discover.cc
index a7681a3c2ba..a499e234a8f 100644
--- a/sql/discover.cc
+++ b/sql/discover.cc
@@ -45,7 +45,7 @@
3 Could not allocate data for read. Could not read file
*/
-int readfrm(const char *name, uchar **frmdata, size_t *len)
+int readfrm(const char *name, const uchar **frmdata, size_t *len)
{
int error;
char index_file[FN_REFLEN];
@@ -134,7 +134,7 @@ int writefrm(const char *path, const char *db, const char *table,
{
error= mysql_file_write(file, frmdata, len, MYF(MY_WME | MY_NABP));
- if (!error && need_sync)
+ if (!error && need_sync && opt_sync_frm)
error= mysql_file_sync(file, MYF(MY_WME)) ||
my_sync_dir_by_file(file_name, MYF(MY_WME));