summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-03-10 21:00:34 +0200
committerMichael Widenius <monty@askmonty.org>2010-03-10 21:00:34 +0200
commite14291c1ff343287344f945bf0ad1b4edf5ab8d8 (patch)
tree506b17443b6b8f297ac86ffb64f2c05d83634fd5
parent7e26959277416489a2f6b26c82332110e0135c26 (diff)
downloadmariadb-git-e14291c1ff343287344f945bf0ad1b4edf5ab8d8.tar.gz
Fix for Bug #534626 MyISAM table created in MariaDB not readable by MySQL
storage/myisam/mi_create.c: Don't set HA_OPTION_NULL_FIELDS if table is not using CHECKSUM as this makes the table incompatible with MySQL.
-rw-r--r--storage/myisam/mi_create.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index 1b92d64d529..bbe58143af5 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
@@ -175,6 +175,13 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
}
}
+ /*
+ Don't set HA_OPTION_NULL_FIELDS if no checksums, as this flag makes
+ that file incompatible with MySQL. This is ok, as this flag is only
+ used if one specifics table level checksums.
+ */
+ if (!(options & HA_OPTION_CHECKSUM))
+ options&= ~HA_OPTION_NULL_FIELDS;
if (packed || (flags & HA_PACK_RECORD))
options|=HA_OPTION_PACK_RECORD; /* Must use packed records */
/* We can't use checksum with static length rows */