summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/checksum.c6
-rw-r--r--mysys/my_static.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/mysys/checksum.c b/mysys/checksum.c
index 664e768ef4e..92ec3d550f1 100644
--- a/mysys/checksum.c
+++ b/mysys/checksum.c
@@ -30,11 +30,13 @@
ha_checksum my_checksum(ha_checksum crc, const byte *pos, uint length)
{
-/* const byte *end=pos+length;
+#ifdef NOT_USED
+ const byte *end=pos+length;
for ( ; pos != end ; pos++)
crc=((crc << 8) + *((uchar*) pos)) + (crc >> (8*sizeof(ha_checksum)-8));
return crc;
-*/
+#else
return (ha_checksum)crc32((uint)crc, (const uchar *)pos, length);
+#endif
}
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 1a33bcf21f3..08d1a93692f 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.h
@@ -19,7 +19,6 @@
a shared library
*/
-#include "mysys_priv.h"
#include <signal.h>
#define MAX_SIGNALS 10 /* Max signals under a dont-allow */