diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-07-10 13:09:07 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-07-10 13:09:07 +0500 |
| commit | 29ca25a675aafb46ad0decd19e7ab82ead72402b (patch) | |
| tree | 630e37500148b29a4c01be4eeb192c14747fc117 /mysql-test/r/csv.result | |
| parent | eb40ffbc66172c01b97b239b4c9c6acc55a43df5 (diff) | |
| download | mariadb-git-29ca25a675aafb46ad0decd19e7ab82ead72402b.tar.gz | |
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:
Fix for bug #29652: csv.test failure: two changes conflict after merge
- test result adjusted.
storage/csv/ha_tina.cc:
Fix for bug #29652: csv.test failure: two changes conflict after merge
- adjust local_saved_data_file_length in case of update as well.
storage/csv/ha_tina.h:
Fix for bug #29652: csv.test failure: two changes conflict after merge
- adjust local_saved_data_file_length in case of update as well.
Diffstat (limited to 'mysql-test/r/csv.result')
| -rw-r--r-- | mysql-test/r/csv.result | 2 |
1 files changed, 2 insertions, 0 deletions
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; |