diff options
| author | unknown <serg@serg.mylan> | 2003-09-03 12:07:18 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-09-03 12:07:18 +0200 |
| commit | 3350532e98b032fa594ce0f26252e8d6c2e94937 (patch) | |
| tree | 84310e757264951823af695be9ae599473f79f1b /include/my_sys.h | |
| parent | 5ab0391a6cab2a63b213a83b0fa95af1ae72582c (diff) | |
| parent | 94b750c67470b793d3affd22ef97943b5a725f52 (diff) | |
| download | mariadb-git-3350532e98b032fa594ce0f26252e8d6c2e94937.tar.gz | |
merged
include/my_sys.h:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 688e8bfc9e3..4e727af3aa8 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -213,7 +213,7 @@ extern uint get_charset_number(const char *cs_name); extern const char *get_charset_name(uint cs_number); extern CHARSET_INFO *get_charset(uint cs_number, myf flags); extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); -extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, +extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, uint cs_flags, myf my_flags); extern void free_charsets(void); extern char *get_charsets_dir(char *buf); @@ -507,6 +507,8 @@ typedef struct st_keycache ulonglong size; } KEY_CACHE; +typedef uint32 ha_checksum; + #include <my_alloc.h> /* Prototypes for mysys and my_func functions */ @@ -749,10 +751,11 @@ extern void print_defaults(const char *conf_file, const char **groups); extern my_bool my_compress(byte *, ulong *, ulong *); extern my_bool my_uncompress(byte *, ulong *, ulong *); extern byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen); -extern ulong checksum(const byte *mem, uint count); +extern ha_checksum my_checksum(ha_checksum crc, const byte *mem, uint count); extern uint my_bit_log2(ulong value); -uint my_count_bits(ulonglong v); +extern uint my_count_bits(ulonglong v); extern void my_sleep(ulong m_seconds); +extern ulong crc32(ulong crc, const uchar *buf, uint len); #ifdef __WIN__ extern my_bool have_tcpip; /* Is set if tcpip is used */ |