diff options
| author | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
| commit | 94cbe6fd293eac2eed1bfd48a31a0498dcb11406 (patch) | |
| tree | 720547939e4403e5a08c0131165d304b2444ea79 /storage/myisam/mi_create.c | |
| parent | 581750330bf6c0777db9e7dfd71c0c5b99a27b28 (diff) | |
| parent | 6706115c0a6db47ea5e640f4f03ca775c3cfda04 (diff) | |
| download | mariadb-git-94cbe6fd293eac2eed1bfd48a31a0498dcb11406.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
client/mysqltest.c:
Auto merged
sql/item.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
strings/decimal.c:
Auto merged
configure.in:
remove 5.0 version increement
sql/ha_archive.cc:
merge
sql/handler.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'storage/myisam/mi_create.c')
| -rw-r--r-- | storage/myisam/mi_create.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index 6d4106afda5..1a17febe94a 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -72,7 +72,6 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, } LINT_INIT(dfile); LINT_INIT(file); - pthread_mutex_lock(&THR_LOCK_myisam); errpos=0; options=0; bzero((byte*) &share,sizeof(share)); @@ -135,7 +134,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, pack_reclength++; min_pack_length++; /* We must test for 257 as length includes pack-length */ - if (test(rec->length >= 257)) + if (test(rec->length >= 257)) { long_varchar_count++; pack_reclength+= 2; /* May be packed on 3 bytes */ @@ -542,6 +541,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, if (! (flags & HA_DONT_TOUCH_DATA)) share.state.create_time= (long) time((time_t*) 0); + pthread_mutex_lock(&THR_LOCK_myisam); + if (ci->index_file_name) { fn_format(filename, ci->index_file_name,"",MI_NAME_IEXT,4); |