diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-28 10:49:16 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-28 10:49:16 +0300 |
| commit | 833f353e34653e8deb8fc7df556398a526b0cb40 (patch) | |
| tree | 739c3565fe5148ff499bf5daae2a711768b66e2f /myisam/mi_search.c | |
| parent | f246b619153704f78ecc60361470f3f664fc6493 (diff) | |
| download | mariadb-git-833f353e34653e8deb8fc7df556398a526b0cb40.tar.gz | |
Changed safe_mysqld -> mysqld_safe
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables
man/Makefile.am:
Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
Changed safe_mysqld -> mysqld_safe
man/mysql.1:
Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
Changed safe_mysqld -> mysqld_safe
man/perror.1:
Changed safe_mysqld -> mysqld_safe
man/replace.1:
Changed safe_mysqld -> mysqld_safe
man/which.2:
Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
Fixed bug when using packed keys.
scripts/Makefile.am:
Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
Changed safe_mysqld -> mysqld_safe
sql/lex.h:
Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
Some changes to SHOW commands.
support-files/binary-configure.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
Changed safe_mysqld -> mysqld_safe
Diffstat (limited to 'myisam/mi_search.c')
| -rw-r--r-- | myisam/mi_search.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_search.c b/myisam/mi_search.c index b9dd8879694..cc6bc4b0fdf 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -265,9 +265,9 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, SEARCH_NO_FIND,SEARCH_LAST and HA_REVERSE_SORT flags. flag is the value returned by _mi_key_cmp and as treated as final */ int flag=0, my_flag=-1; - uint nod_flag, length, len, matched, cmplen, kseg_len, key_len_left; + uint nod_flag, length, len, matched, cmplen, kseg_len; uint prefix_len,suffix_len; - int key_len_skip, seg_len_pack; + int key_len_skip, seg_len_pack, key_len_left; uchar *end, *kseg, *vseg; uchar *sort_order=keyinfo->seg->charset->sort_order; uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2; @@ -294,7 +294,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, uint lenght_pack; get_key_pack_length(kseg_len,lenght_pack,kseg); key_len_skip=lenght_pack+kseg_len; - key_len_left=key_len-key_len_skip; + key_len_left=(int) key_len- (int) key_len_skip; cmplen=(key_len_left>=0) ? kseg_len : key_len-lenght_pack; } |