diff options
| author | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-17 17:07:14 +0100 |
| commit | 017efd2124a70d0cad3b100e72eb975d46aa9ad1 (patch) | |
| tree | 6ebf0969524ee8c2567a33c286ae057b66a556ae /myisam | |
| parent | 18d1234ada5b66836e8f5f2f4d49e85b9cc87e09 (diff) | |
| parent | a0040b0bdabae307e19fa5bd46fc13968db17135 (diff) | |
| download | mariadb-git-017efd2124a70d0cad3b100e72eb975d46aa9ad1.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_parser.c | 20 | ||||
| -rw-r--r-- | myisam/ft_static.c | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/myisam/ft_parser.c b/myisam/ft_parser.c index f68bf3f030c..250e92566b7 100644 --- a/myisam/ft_parser.c +++ b/myisam/ft_parser.c @@ -73,6 +73,26 @@ FT_WORD * ft_linearize(TREE *wtree) DBUG_RETURN(wlist); } +my_bool ft_boolean_check_syntax_string(const byte *str) +{ + uint i, j; + + if (!str || + (strlen(str)+1 != sizeof(ft_boolean_syntax)) || + (str[0] != ' ' && str[1] != ' ')) + return 1; + for (i=0; i<sizeof(ft_boolean_syntax); i++) + { + /* limiting to 7-bit ascii only */ + if ((unsigned char)(str[i]) > 127 || my_isalnum(default_charset_info, str[i])) + return 1; + for (j=0; j<i; j++) + if (str[i] == str[j] && (i != 11 || j != 10)) + return 1; + } + return 0; +} + /* returns: * 0 - eof * 1 - word found diff --git a/myisam/ft_static.c b/myisam/ft_static.c index 0dcea5bec0c..7168406d027 100644 --- a/myisam/ft_static.c +++ b/myisam/ft_static.c @@ -21,7 +21,7 @@ ulong ft_min_word_len=4; ulong ft_max_word_len=HA_FT_MAXCHARLEN; ulong ft_query_expansion_limit=5; -const char *ft_boolean_syntax="+ -><()~*:\"\"&|"; +char ft_boolean_syntax[]="+ -><()~*:\"\"&|"; const HA_KEYSEG ft_keysegs[FT_SEGS]={ { |