From 5fb5f2a9a5f898eeceeb6398ce67fef84423ec6c Mon Sep 17 00:00:00 2001
From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <>
Date: Tue, 10 Jul 2007 13:09:07 +0500
Subject: Fix for bug #29652: csv.test failure: two changes conflict after
 merge

Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.
---
 mysql-test/r/csv.result | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result
index 65677e75ceb..86ba5002af8 100644
--- a/mysql-test/r/csv.result
+++ b/mysql-test/r/csv.result
@@ -4945,6 +4945,8 @@ SELECT * FROM bug13894;
 val
 6
 6
+5
+11
 DROP TABLE bug13894;
 DROP TABLE IF EXISTS bug14672;
 CREATE TABLE bug14672 (c1 integer) engine = CSV;
-- 
cgit v1.2.1