diff options
| author | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.fi> | 2003-09-24 10:24:56 +0300 |
| commit | 74e3399af186b3159738c0c9c55672f0dbd7705c (patch) | |
| tree | cc7389163da24340a03858b997927a41eeedc545 /mysys | |
| parent | 4e09f14b18ededb18aab527abe582fca34afe79c (diff) | |
| parent | 1c50f8ac7894e7a59e25f720ab700cbe73986347 (diff) | |
| download | mariadb-git-74e3399af186b3159738c0c9c55672f0dbd7705c.tar.gz | |
merge
sql/item_strfunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/net_serv.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/checksum.c | 6 | ||||
| -rw-r--r-- | mysys/my_static.h | 1 |
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 */ |