summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorramil/ram@ramil.myoffice.izhnet.ru <>2007-07-10 14:22:37 +0500
committerramil/ram@ramil.myoffice.izhnet.ru <>2007-07-10 14:22:37 +0500
commit372856cd72003cf497ee85ccf3ae1806dff078a2 (patch)
treeafd476feff42a8ffcb208d378aaa901810b96bd3 /mysql-test
parent810db44e4fc8cf65f113fb487c718e9c05ae8073 (diff)
parent5fb5f2a9a5f898eeceeb6398ce67fef84423ec6c (diff)
downloadmariadb-git-372856cd72003cf497ee85ccf3ae1806dff078a2.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/ram/work/mysql-5.1-maint
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/csv.result2
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;