diff options
| author | unknown <monty@mysql.com> | 2004-03-25 15:05:42 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-25 15:05:42 +0200 |
| commit | d78cb8998133d98b595b791379b9d1424c103962 (patch) | |
| tree | b090f762169aabf4fa3602b52d4463cd9c66106b /include | |
| parent | 7674fd064c7a2d8b2efec1ee8d7b4eaae0dd7fc5 (diff) | |
| parent | 3c46af6cf4e935683e5288c55f8b4ff4badaa553 (diff) | |
| download | mariadb-git-d78cb8998133d98b595b791379b9d1424c103962.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
myisam/mi_check.c:
Auto merged
sql/field.cc:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_handler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_handler.h b/include/my_handler.h index 618d1df1a6e..18a6234d3f6 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -58,7 +58,7 @@ typedef struct st_HA_KEYSEG /* Key-portion */ } extern int mi_compare_text(CHARSET_INFO *, uchar *, uint, uchar *, uint , - my_bool); + my_bool, my_bool); extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, register uchar *b, uint key_length, uint nextflag, uint *diff_pos); |