diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-15 15:17:32 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-15 15:17:32 +0500 |
| commit | 3929dddcd76130529cabfbd68cfff024e6b5c80d (patch) | |
| tree | 7f2c2690a6c4b4439750de17315dbc10dec56617 /include | |
| parent | 4def52165d3724080793a752f244e56aea3aecc0 (diff) | |
| download | mariadb-git-3929dddcd76130529cabfbd68cfff024e6b5c80d.tar.gz | |
Backporting WL#4164 Two-byte collation IDs
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_handler.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/myisam.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/my_handler.h b/include/my_handler.h index a3376cb74a2..ae56331df86 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -53,8 +53,8 @@ typedef struct st_HA_KEYSEG /* Key-portion */ uint16 bit_pos; /* Position to bit part */ uint16 flag; uint16 length; /* Keylength */ + uint16 language; uint8 type; /* Type of key (for sort) */ - uint8 language; uint8 null_bit; /* bitmask to test for NULL */ uint8 bit_start,bit_end; /* if bit field */ uint8 bit_length; /* Length of bit part */ diff --git a/include/my_sys.h b/include/my_sys.h index 4b93dc0e364..34965ae9c67 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -231,8 +231,9 @@ extern uint my_large_page_size; #endif /* charsets */ +#define MY_ALL_CHARSETS_SIZE 2048 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; -extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[256]; +extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE]; extern CHARSET_INFO compiled_charsets[]; /* statistics */ diff --git a/include/myisam.h b/include/myisam.h index 02251eeacb4..70c6f33f118 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -162,7 +162,7 @@ typedef struct st_mi_create_info ulonglong data_file_length; ulonglong key_file_length; uint old_options; - uint8 language; + uint16 language; my_bool with_auto_increment; } MI_CREATE_INFO; @@ -410,7 +410,7 @@ typedef struct st_mi_check_param uint out_flag,warning_printed,error_printed,verbose; uint opt_sort_key,total_files,max_level; uint testflag, key_cache_block_size; - uint8 language; + uint16 language; my_bool using_global_keycache, opt_lock_memory, opt_follow_links; my_bool retry_repair, force_sort; char temp_filename[FN_REFLEN],*isam_file_name; |