bk commit into 5.1 tree (petr:1.2283)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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, 2006-08-23 17:22:09+04:00, petr@stripped +1 -0
  after merge fix

  storage/csv/ha_tina.cc@stripped, 2006-08-23 17:22:04+04:00, petr@stripped +5 -4
    after merge fix

# 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:	petr
# Host:	owlet.local
# Root:	/home/cps/mysql/trees/mysql-5.1-virgin

--- 1.56/storage/csv/ha_tina.cc	2006-08-23 17:22:24 +04:00
+++ 1.57/storage/csv/ha_tina.cc	2006-08-23 17:22:24 +04:00
@@ -229,6 +229,11 @@ static TINA_SHARE *get_share(const char 
               MY_REPLACE_EXT|MY_UNPACK_FILENAME);
     fn_format(meta_file_name, table_name, "", CSM_EXT,
               MY_REPLACE_EXT|MY_UNPACK_FILENAME);
+
+    if (my_stat(share->data_file_name, &file_stat, MYF(MY_WME)) == NULL)
+      goto error;
+    share->saved_data_file_length= file_stat.st_size;
+
     if (my_hash_insert(&tina_open_tables, (byte*) share))
       goto error;
     thr_lock_init(&share->lock);
@@ -250,10 +255,6 @@ static TINA_SHARE *get_share(const char 
     */
     if (read_meta_file(share->meta_file, &share->rows_recorded))
       share->crashed= TRUE;
-
-    if (my_stat(share->data_file_name, &file_stat, MYF(MY_WME)) == NULL)
-      goto error2;
-    share->saved_data_file_length= file_stat.st_size;
   }
   share->use_count++;
   pthread_mutex_unlock(&tina_mutex);