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 /include | |
| 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 'include')
| -rw-r--r-- | include/ft_global.h | 3 | ||||
| -rw-r--r-- | include/my_global.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index c30b0665216..94f6ad9ef51 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -52,7 +52,7 @@ extern const char *ft_precompiled_stopwords[]; extern ulong ft_min_word_len; extern ulong ft_max_word_len; extern ulong ft_query_expansion_limit; -extern const char *ft_boolean_syntax; +extern char ft_boolean_syntax[15]; int ft_init_stopwords(void); void ft_free_stopwords(void); @@ -63,6 +63,7 @@ void ft_free_stopwords(void); #define FT_EXPAND 4 /* query expansion */ FT_INFO *ft_init_search(uint,void *, uint, byte *, uint, byte *); +my_bool ft_boolean_check_syntax_string(const byte *); #ifdef __cplusplus } diff --git a/include/my_global.h b/include/my_global.h index 4a1786f70e2..dff88a8a264 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -384,8 +384,8 @@ typedef unsigned short ushort; #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) #define swap(t,a,b) { register t dummy; dummy = a; a = b; b = dummy; } #define test(a) ((a) ? 1 : 0) -#define set_if_bigger(a,b) { if ((a) < (b)) (a)=(b); } -#define set_if_smaller(a,b) { if ((a) > (b)) (a)=(b); } +#define set_if_bigger(a,b) do { if ((a) < (b)) (a)=(b); } while(0) +#define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0) #define test_all_bits(a,b) (((a) & (b)) == (b)) #define set_bits(type, bit_count) (sizeof(type)*8 <= (bit_count) ? ~(type) 0 : ((((type) 1) << (bit_count)) - (type) 1)) #define array_elements(A) ((uint) (sizeof(A)/sizeof(A[0]))) |