diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-07-01 16:48:57 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-07-01 16:48:57 +0300 |
| commit | e2904e77f1803b00615e00caef5c057c36c10b86 (patch) | |
| tree | f082aac720c3fe4e32b3a8c776dcae674ea31d4c /include/maria.h | |
| parent | 4b1fe65b5fd169ed6d870e38f126780ed2184536 (diff) | |
| parent | d6f2fda680ec2be373ff5694e91cfccf792f4eb0 (diff) | |
| download | mariadb-git-e2904e77f1803b00615e00caef5c057c36c10b86.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/maria.h:
Auto merged
sql/handler.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ma_pagecache.h:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/ma_blockrec.c:
Manual merge (No changes)
storage/maria/ma_check.c:
Manual merge
storage/maria/ma_create.c:
Manual merge
storage/maria/ma_delete_all.c:
Manual merge
storage/maria/ma_init.c:
Manual merge (no changes)
storage/maria/ma_test_all.sh:
Manual merge
storage/maria/maria_def.h:
Manual merge
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/maria.h b/include/maria.h index 5f8e3dcdd41..edecef9eeeb 100644 --- a/include/maria.h +++ b/include/maria.h @@ -325,17 +325,18 @@ typedef struct st_maria_sort_info pthread_mutex_t mutex; pthread_cond_t cond; #endif - MARIA_HA *info; + MARIA_HA *info, *new_info; HA_CHECK *param; char *buff; SORT_KEY_BLOCKS *key_block, *key_block_end; SORT_FT_BUF *ft_buf; my_off_t filelength, dupp, buff_length; + ulonglong page; ha_rows max_records; uint current_key, total_keys; uint got_error, threads_running; myf myf_rw; - enum data_file_type new_data_file_type; + enum data_file_type new_data_file_type, org_data_file_type; } MARIA_SORT_INFO; typedef struct st_maria_sort_param |