diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-13 15:53:18 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-13 15:53:18 +0200 |
| commit | a63ecdd3b14e7abfd482131c924567bd25aa231a (patch) | |
| tree | dc20d248b63f5dc477b5701978425924a376f6ff /myisam/ft_update.c | |
| parent | f6ff0c4916852517c2f1a0327056a807ffc27b74 (diff) | |
| download | mariadb-git-a63ecdd3b14e7abfd482131c924567bd25aa231a.tar.gz | |
Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Docs/Makefile.am:
Add missing files
Docs/manual.texi:
Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
Removed compiler warnings
mysql-test/mysql-test-run.sh:
Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
New tests
mysql-test/t/func_str.test:
Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
New HEX() function
sql/item_strfunc.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
New HEX() function
sql/item_timefunc.cc:
cleanup
sql/lex.h:
FLUSH DES_KEY_FILE
sql/mysql_priv.h:
FLUSH DES_KEY_FILE
sql/mysqld.cc:
FLUSH DES_KEY_FILE
sql/sql_parse.cc:
Cleanup sql_yacc.yy
sql/sql_yacc.yy:
Cleanup sql_yacc.yy
Diffstat (limited to 'myisam/ft_update.c')
| -rw-r--r-- | myisam/ft_update.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c index 01dd67b97fa..a946b0beabe 100644 --- a/myisam/ft_update.c +++ b/myisam/ft_update.c @@ -75,7 +75,8 @@ uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi) if (ftsi->seg->flag & HA_BLOB_PART) { ftsi->len=_mi_calc_blob_length(ftsi->seg->bit_start,ftsi->pos); - memcpy_fixed(&ftsi->pos,ftsi->pos+ftsi->seg->bit_start,sizeof(char*)); + memcpy_fixed((char*) &ftsi->pos, ftsi->pos+ftsi->seg->bit_start, + sizeof(char*)); set_if_smaller(ftsi->len,ftsi->seg->length); return 1; } @@ -107,11 +108,11 @@ FT_WORD * _mi_ft_parserecord(MI_INFO *info, uint keynr, { TREE ptree; - bzero(&ptree, sizeof(ptree)); - if (_mi_ft_parse(& ptree, info, keynr, record)) + bzero((char*) &ptree, sizeof(ptree)); + if (_mi_ft_parse(&ptree, info, keynr, record)) return NULL; - return ft_linearize(/*info, keynr, keybuf, */ & ptree); + return ft_linearize(/*info, keynr, keybuf, */ &ptree); } static int _mi_ft_store(MI_INFO *info, uint keynr, byte *keybuf, |