From e36be72adbca91524e8575132ffa939ed93068f7 Mon Sep 17 00:00:00 2001
From: "petr/cps@mysql.com/owlet.local" <>
Date: Thu, 24 Aug 2006 16:17:42 +0400
Subject: [PATCH] after merge fix

---
 mysql-test/t/csv.test  | 2 +-
 storage/csv/ha_tina.cc | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index a042f163635..9815da4fb55 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -1575,7 +1575,7 @@ create table bug15205 (val int(11) default null) engine=csv;
 create table bug15205_2 (val int(11) default null) engine=csv;
 --exec rm $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV
 # system error (can't open the datafile)
---error ER_GET_ERRNO
+--error 13
 select * from bug15205;
 select * from bug15205_2;
 --exec touch $MYSQLTEST_VARDIR/master-data/test/bug15205.CSV
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index bec236becd0..5d18ed99a9a 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -229,6 +229,11 @@ static TINA_SHARE *get_share(const char *table_name, TABLE *table)
               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 *table_name, TABLE *table)
     */
     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);