summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-12-23 20:50:28 +0100
committerserg@serg.mylan <>2005-12-23 20:50:28 +0100
commitc0638190759a616adc447207e18c155c81132ee9 (patch)
tree2594fb169d9c168d8ecb0490a4bbebd32149426e /myisam
parentb867ef6df010e1fdc9da4c20f8c0fa56147ae7b5 (diff)
downloadmariadb-git-c0638190759a616adc447207e18c155c81132ee9.tar.gz
locking issues,
test for LONGLONG_MIN in decimal.c
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_create.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index 6d4106afda5..1a17febe94a 100644
--- a/myisam/mi_create.c
+++ b/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);