diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 21:13:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-23 21:13:26 +0200 |
| commit | ca42b36cc99fa0fb1d12a3150316bf3164909a07 (patch) | |
| tree | 09269afde6ea92811b9a270afbfa86d3dc42dcc2 /include/my_base.h | |
| parent | b635df555adec7ebdc4cd40e102d51006c802639 (diff) | |
| parent | 345959c660d7401c9dc991a2c572ba145d6e199c (diff) | |
| download | mariadb-git-ca42b36cc99fa0fb1d12a3150316bf3164909a07.tar.gz | |
Merge with new version
storage/myisam/mi_rsamepos.c:
Auto merged
include/m_string.h:
Automatic merge
include/maria.h:
manual merge
include/my_base.h:
Automatic merge
include/my_sys.h:
Automatic merge
mysys/mf_keycache.c:
Automatic merge
mysys/my_pread.c:
Automatic merge
sql/filesort.cc:
Automatic merge
sql/gen_lex_hash.cc:
Automatic merge
sql/mysqld.cc:
Automatic merge
sql/uniques.cc:
Automatic merge
storage/maria/Makefile.am:
manual_merge
storage/maria/ha_maria.cc:
Automatic merge
storage/maria/ma_check.c:
manual merge
storage/maria/ma_close.c:
manual merge
storage/maria/ma_create.c:
manual merge
storage/maria/ma_delete.c:
manual merge
storage/maria/ma_delete_all.c:
Automatic merge
storage/maria/ma_dynrec.c:
manual merge
storage/maria/ma_extra.c:
Automatic merge
storage/maria/ma_ft_boolean_search.c:
manual merge
storage/maria/ma_init.c:
Automatic merge
storage/maria/ma_key.c:
manual merge
storage/maria/ma_keycache.c:
manual merge
storage/maria/ma_locking.c:
Automatic merge
storage/maria/ma_open.c:
manual merge
storage/maria/ma_packrec.c:
manual merge
storage/maria/ma_page.c:
Automatic merge
storage/maria/ma_range.c:
Automatic merge
storage/maria/ma_rkey.c:
manual merge
storage/maria/ma_rsamepos.c:
manual merge
storage/maria/ma_sort.c:
manual merge
storage/maria/ma_statrec.c:
Automatic merge
storage/maria/ma_test2.c:
Automatic merge
storage/maria/ma_test3.c:
Automatic merge
storage/maria/ma_test_all.sh:
Use new version
storage/maria/ma_unique.c:
Automatic merge
storage/maria/ma_update.c:
Automatic merge
storage/maria/ma_write.c:
manual merge
storage/maria/maria_chk.c:
manual merge
storage/maria/maria_def.h:
manual merge
Added length pointer to _ma_page_get_block_info()
storage/maria/maria_ftdump.c:
Automatic merge
storage/maria/maria_pack.c:
manual merge
storage/myisam/mi_check.c:
Automatic merge
storage/myisam/mi_create.c:
Automatic merge
storage/myisam/mi_test2.c:
Automatic merge
storage/myisam/sort.c:
Automatic merge
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index 63af3bf228d..7b001793fcf 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -48,7 +48,7 @@ #define HA_OPEN_FOR_REPAIR 32 /* open even if crashed */ #define HA_OPEN_FROM_SQL_LAYER 64 - /* The following is parameter to ha_rkey() how to use key */ +/* The following is parameter to ha_rkey() how to use key */ /* We define a complete-field prefix of a key value as a prefix where @@ -440,7 +440,7 @@ enum en_fieldtype { }; enum data_file_type { - STATIC_RECORD,DYNAMIC_RECORD,COMPRESSED_RECORD + STATIC_RECORD, DYNAMIC_RECORD, COMPRESSED_RECORD, BLOCK_RECORD }; /* For key ranges */ |