maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2831
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: maria-5.1
timestamp: Fri 2010-03-12 20:03:37 +0100
message:
  Fix myisam checksum patch to check for HA_OPTION_CHECKSUM after it was set, not before
modified:
  storage/myisam/mi_create.c


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'storage/myisam/mi_create.c'
--- storage/myisam/mi_create.c	2010-03-10 19:00:34 +0000
+++ storage/myisam/mi_create.c	2010-03-12 19:03:37 +0000
@@ -175,13 +175,6 @@
     }
   }
 
-  /*
-    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 */
@@ -199,6 +192,13 @@
     options|= HA_OPTION_CHECKSUM;
     min_pack_length++;
   }
+  /*
+    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 (flags & HA_CREATE_DELAY_KEY_WRITE)
     options|= HA_OPTION_DELAY_KEY_WRITE;
   if (flags & HA_CREATE_RELIES_ON_SQL_LAYER)