summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-09-29 15:31:46 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-09-29 15:31:46 +0300
commit0c775ea96f7d1c990da6a6a54c75e6c1fc8ae047 (patch)
treefccb7f56e74e0f56b4b70127a79be8b728d98b12 /mysql-test
parent593c9457cd8533091ac1bad1e85234e79c0ce6a3 (diff)
downloadmariadb-git-0c775ea96f7d1c990da6a6a54c75e6c1fc8ae047.tar.gz
Update the German error message translations (by Stefan Hinz)
and fix some Swedish too.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/group_by.result2
-rw-r--r--mysql-test/r/having.result2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 950de54b815..66c6790e7d9 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -1676,7 +1676,7 @@ c (SELECT a FROM t1 WHERE b = c)
SELECT b c, (SELECT a FROM t1 WHERE b = c)
FROM t1
HAVING b = 10;
-ERROR 42000: non-grouping field 'b' is used in HAVING clause
+ERROR 42000: Non-grouping field 'b' is used in HAVING clause
SELECT MAX(b) c, (SELECT a FROM t1 WHERE b = c)
FROM t1
HAVING b = 10;
diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result
index 1bbdd5011c4..5508ee5ed7d 100644
--- a/mysql-test/r/having.result
+++ b/mysql-test/r/having.result
@@ -419,7 +419,7 @@ select f1 from t1 group by f1 having max(f1)=f1;
f1
set session sql_mode='ONLY_FULL_GROUP_BY';
select f1 from t1 having max(f1)=f1;
-ERROR 42000: non-grouping field 'f1' is used in HAVING clause
+ERROR 42000: Non-grouping field 'f1' is used in HAVING clause
select f1 from t1 group by f1 having max(f1)=f1;
f1
set session sql_mode='';