From: Date: January 17 2007 10:11am Subject: bk commit into 5.1 tree (svoj:1.2377) List-Archive: http://lists.mysql.com/commits/18235 Message-Id: <20070117091141.68D7741CEC2@june.myoffice.izhnet.ru> Below is the list of changes that have just been committed into a local 5.1 repository of svoj. When svoj does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-01-17 13:11:37+04:00, svoj@stripped +1 -0 Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.1-engines MERGE: 1.1810.2362.35 storage/myisam/mi_open.c@stripped, 2007-01-17 13:11:35+04:00, svoj@stripped +0 -0 Auto merged MERGE: 1.90.16.2 storage/myisam/mi_open.c@stripped, 2007-01-17 13:11:35+04:00, svoj@stripped +0 -0 Merge rename: myisam/mi_open.c -> storage/myisam/mi_open.c # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: svoj # Host: june.mysql.com # Root: /home/svoj/devel/mysql/BUG24855/mysql-5.1-engines/RESYNC --- 1.90.16.1/myisam/mi_open.c 2007-01-17 12:59:51 +04:00 +++ 1.113/storage/myisam/mi_open.c 2007-01-17 13:11:35 +04:00 @@ -94,7 +94,8 @@ MI_INFO *mi_open(const char *name, int m head_length=sizeof(share_buff.state.header); bzero((byte*) &info,sizeof(info)); - my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT,4),MYF(0)); + my_realpath(name_buff, fn_format(org_name,name,"",MI_NAME_IEXT, + MY_UNPACK_FILENAME),MYF(0)); pthread_mutex_lock(&THR_LOCK_myisam); if (!(old_info=test_if_reopen(name_buff))) { @@ -140,17 +141,27 @@ MI_INFO *mi_open(const char *name, int m ~(HA_OPTION_PACK_RECORD | HA_OPTION_PACK_KEYS | HA_OPTION_COMPRESS_RECORD | HA_OPTION_READ_ONLY_DATA | HA_OPTION_TEMP_COMPRESS_RECORD | HA_OPTION_CHECKSUM | - HA_OPTION_TMP_TABLE | HA_OPTION_DELAY_KEY_WRITE)) + HA_OPTION_TMP_TABLE | HA_OPTION_DELAY_KEY_WRITE | + HA_OPTION_RELIES_ON_SQL_LAYER)) { DBUG_PRINT("error",("wrong options: 0x%lx", share->options)); my_errno=HA_ERR_OLD_FILE; goto err; } + if ((share->options & HA_OPTION_RELIES_ON_SQL_LAYER) && + ! (open_flags & HA_OPEN_FROM_SQL_LAYER)) + { + DBUG_PRINT("error", ("table cannot be openned from non-sql layer")); + my_errno= HA_ERR_UNSUPPORTED; + goto err; + } /* Don't call realpath() if the name can't be a link */ if (!strcmp(name_buff, org_name) || my_readlink(index_name, org_name, MYF(0)) == -1) (void) strmov(index_name, org_name); - (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,2+4+16); + *strrchr(org_name, '.')= '\0'; + (void) fn_format(data_name,org_name,"",MI_NAME_DEXT, + MY_APPEND_EXT|MY_UNPACK_FILENAME|MY_RESOLVE_SYMLINKS); info_length=mi_uint2korr(share->state.header.header_length); base_pos=mi_uint2korr(share->state.header.base_pos); @@ -196,9 +207,9 @@ MI_INFO *mi_open(const char *name, int m if (len != MI_BASE_INFO_SIZE) { DBUG_PRINT("warning",("saved_base_info_length: %d base_info_length: %d", - len,MI_BASE_INFO_SIZE)) + len,MI_BASE_INFO_SIZE)); } - disk_pos= (char*) + disk_pos= (char*) my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base); share->state.state_length=base_pos; @@ -286,10 +297,11 @@ MI_INFO *mi_open(const char *name, int m &share->data_file_name,strlen(data_name)+1, &share->state.key_root,keys*sizeof(my_off_t), &share->state.key_del, - (share->state.header.max_block_size*sizeof(my_off_t)), + (share->state.header.max_block_size_index*sizeof(my_off_t)), #ifdef THREAD &share->key_root_lock,sizeof(rw_lock_t)*keys, #endif + &share->mmap_lock,sizeof(rw_lock_t), NullS)) goto err; errpos=4; @@ -300,7 +312,7 @@ MI_INFO *mi_open(const char *name, int m (char*) key_root, sizeof(my_off_t)*keys); memcpy((char*) share->state.key_del, (char*) key_del, (sizeof(my_off_t) * - share->state.header.max_block_size)); + share->state.header.max_block_size_index)); strmov(share->unique_file_name, name_buff); share->unique_name_length= strlen(name_buff); strmov(share->index_file_name, index_name); @@ -427,6 +439,7 @@ MI_INFO *mi_open(const char *name, int m pos->flag=0; pos++; } + share->ftparsers= 0; } disk_pos_assert(disk_pos + share->base.fields *MI_COLUMNDEF_SIZE, end_pos); @@ -469,7 +482,6 @@ MI_INFO *mi_open(const char *name, int m (keys ? MI_INDEX_BLOCK_MARGIN * share->blocksize * keys : 0)); share->blocksize=min(IO_SIZE,myisam_block_size); - share->data_file_type=STATIC_RECORD; if (share->options & HA_OPTION_COMPRESS_RECORD) { @@ -487,11 +499,13 @@ MI_INFO *mi_open(const char *name, int m share->data_file_type = DYNAMIC_RECORD; my_afree((gptr) disk_cache); mi_setup_functions(share); + share->is_log_table= FALSE; #ifdef THREAD thr_lock_init(&share->lock); VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST)); for (i=0; ikey_root_lock[i], NULL)); + VOID(my_rwlock_init(&share->mmap_lock, NULL)); if (!thr_lock_inited) { /* Probably a single threaded program; Don't use concurrent inserts */ @@ -747,6 +761,8 @@ void mi_setup_functions(register MYISAM_ share->compare_unique=_mi_cmp_static_unique; share->calc_checksum= mi_static_checksum; } + share->file_read= mi_nommap_pread; + share->file_write= mi_nommap_pwrite; if (!(share->options & HA_OPTION_CHECKSUM)) share->calc_checksum=0; return; @@ -816,7 +832,7 @@ uint mi_state_info_write(File file, MI_S uchar buff[MI_STATE_INFO_SIZE + MI_STATE_EXTRA_SIZE]; uchar *ptr=buff; uint i, keys= (uint) state->header.keys, - key_blocks=state->header.max_block_size; + key_blocks=state->header.max_block_size_index; DBUG_ENTER("mi_state_info_write"); memcpy_fixed(ptr,&state->header,sizeof(state->header)); @@ -882,7 +898,7 @@ uchar *mi_state_info_read(uchar *ptr, MI ptr +=sizeof(state->header); keys=(uint) state->header.keys; key_parts=mi_uint2korr(state->header.key_parts); - key_blocks=state->header.max_block_size; + key_blocks=state->header.max_block_size_index; state->open_count = mi_uint2korr(ptr); ptr +=2; state->changed= (bool) *ptr++; @@ -1055,9 +1071,11 @@ char *mi_keydef_read(char *ptr, MI_KEYDE keydef->keylength = mi_uint2korr(ptr); ptr +=2; keydef->minlength = mi_uint2korr(ptr); ptr +=2; keydef->maxlength = mi_uint2korr(ptr); ptr +=2; - keydef->block_size = keydef->block_length/MI_MIN_KEY_BLOCK_LENGTH-1; + keydef->block_size_index= keydef->block_length/MI_MIN_KEY_BLOCK_LENGTH-1; keydef->underflow_block_length=keydef->block_length/3; keydef->version = 0; /* Not saved */ + keydef->parser = &ft_default_parser; + keydef->ftparser_nr = 0; return ptr; }